details: http://hg.sympy.org/sympy/rev/b24fc7dacb62
changeset: 1815:b24fc7dacb62
user: Ondrej Certik <[EMAIL PROTECTED]>
date: Sun Oct 19 16:15:18 2008 +0200
description:
Imports fixed using bin/adapt_paths.py
Signed-off-by: Ondrej Certik <[EMAIL PROTECTED]>
Signed-off-by: Fredrik Johansson <[EMAIL PROTECTED]>
diffs (636 lines):
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_basic_ops.py
--- a/sympy/mpmath/tests/test_basic_ops.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_basic_ops.py Sun Oct 19 16:15:18 2008 +0200
@@ -1,4 +1,4 @@
-from mpmath import *
+from sympy.mpmath import *
def test_type_compare():
assert mpf(2) == mpc(2,0)
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_bitwise.py
--- a/sympy/mpmath/tests/test_bitwise.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_bitwise.py Sun Oct 19 16:15:18 2008 +0200
@@ -2,7 +2,7 @@
Test bit-level integer operations
"""
-from mpmath.libmpf import *
+from sympy.mpmath.libmpf import *
def test_bitcount():
assert bitcount(0) == 0
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_calculus.py
--- a/sympy/mpmath/tests/test_calculus.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_calculus.py Sun Oct 19 16:15:18 2008 +0200
@@ -1,4 +1,4 @@
-from mpmath import *
+from sympy.mpmath import *
def test_approximation():
mp.dps = 15
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_compatibility.py
--- a/sympy/mpmath/tests/test_compatibility.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_compatibility.py Sun Oct 19 16:15:18 2008 +0200
@@ -1,4 +1,4 @@
-from mpmath import *
+from sympy.mpmath import *
from random import seed, randint, random
import math
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_convert.py
--- a/sympy/mpmath/tests/test_convert.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_convert.py Sun Oct 19 16:15:18 2008 +0200
@@ -1,6 +1,6 @@
import random
-from mpmath import *
-from mpmath.libmpf import *
+from sympy.mpmath import *
+from sympy.mpmath.libmpf import *
def test_basic_string():
@@ -95,10 +95,10 @@
class SomethingRandom:
pass
class SomethingReal:
- def _mpmath_(self, prec, rounding):
+ def _sympy.mpmath_(self, prec, rounding):
return make_mpf(from_str('1.3', prec, rounding))
class SomethingComplex:
- def _mpmath_(self, prec, rounding):
+ def _sympy.mpmath_(self, prec, rounding):
return make_mpc((from_str('1.3', prec, rounding), \
from_str('1.7', prec, rounding)))
x = mpf(3)
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_diff.py
--- a/sympy/mpmath/tests/test_diff.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_diff.py Sun Oct 19 16:15:18 2008 +0200
@@ -1,4 +1,4 @@
-from mpmath import *
+from sympy.mpmath import *
def test_diff():
assert diff(cos, 1).ae(-sin(1))
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_division.py
--- a/sympy/mpmath/tests/test_division.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_division.py Sun Oct 19 16:15:18 2008 +0200
@@ -1,5 +1,5 @@
-from mpmath.libmpf import *
-from mpmath import mpf
+from sympy.mpmath.libmpf import *
+from sympy.mpmath import mpf
from random import randint, choice, seed
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_elliptic.py
--- a/sympy/mpmath/tests/test_elliptic.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_elliptic.py Sun Oct 19 16:15:18 2008 +0200
@@ -15,11 +15,11 @@
__version__ = '$Id:$'
import unittest
-#import mpmath.mptypes # switch to this once integrated with mpmath
-import mpmath
+#import sympy.mpmath.mptypes # switch to this once integrated with
sympy.mpmath
+import sympy.mpmath
import random
-from mpmath.elliptic import *
+from sympy.mpmath.elliptic import *
class precisemathTests(unittest.TestCase):
@@ -27,13 +27,13 @@
pass
def testCalculateNome(self):
- mpmath.mpf.dps = 100
- mpmath.mp.dps = 100
- testlimit = mpmath.mpf('10')**(-1*(mpmath.mpf.dps - 2))
+ sympy.mpmath.mpf.dps = 100
+ sympy.mpmath.mp.dps = 100
+ testlimit = sympy.mpmath.mpf('10')**(-1*(sympy.mpmath.mpf.dps - 2))
#print >> sys.stderr, testlimit
- q = calculate_nome(mpmath.mpf('0'))
- self.assertEquals(mpmath.mpf('0'), mpmath.mpf('0'))
+ q = calculate_nome(sympy.mpmath.mpf('0'))
+ self.assertEquals(sympy.mpmath.mpf('0'), sympy.mpmath.mpf('0'))
mathematica = [ (0.1, 0.00658465),
(0.3, 0.0222774),
@@ -43,140 +43,140 @@
(0.99, 0.262196)]
for i in mathematica:
- m = mpmath.mpf(i[0])
+ m = sympy.mpmath.mpf(i[0])
value = calculate_nome(m.sqrt())
self.assertEquals(round(i[1], 6), round(value, 6))
def testJacobiTheta1(self):
- mpmath.mpf.dps = 100
- mpmath.mp.dps = 100
- testlimit = mpmath.mpf('10')**(-1*(mpmath.mpf.dps - 2))
+ sympy.mpmath.mpf.dps = 100
+ sympy.mpmath.mp.dps = 100
+ testlimit = sympy.mpmath.mpf('10')**(-1*(sympy.mpmath.mpf.dps - 2))
#print >> sys.stderr, testlimit
- zero = mpmath.mpf('0')
+ zero = sympy.mpmath.mpf('0')
#self.assertRaises(TypeError, jacobi_theta_1, 0, 0)
- z = mpmath.mpf('0')
- q = mpmath.mpf('0')
+ z = sympy.mpmath.mpf('0')
+ q = sympy.mpmath.mpf('0')
value = jacobi_theta_1(z, q)
- self.assertEquals(value, mpmath.mpf('0'))
+ self.assertEquals(value, sympy.mpmath.mpf('0'))
- z = mpmath.mpf('0')
- m = mpmath.pi
+ z = sympy.mpmath.mpf('0')
+ m = sympy.mpmath.pi
self.assertRaises(ValueError, jacobi_theta_1, z, m)
- m = mpmath.mpf('1')
+ m = sympy.mpmath.mpf('1')
self.assertRaises(ValueError, jacobi_theta_1, z, m)
# Mathematica value for v1(u = 0.1, q = 0.1) = 0.108958
# q = 0.1, therefore m = 0.802403, according to Mathematica
- z = mpmath.mpf('0.1')
- m = mpmath.mpf('0.802403')
+ z = sympy.mpmath.mpf('0.1')
+ m = sympy.mpmath.mpf('0.802403')
result = jacobi_theta_1(z, m)
self.assertEquals(round(result, 6), 0.108958)
- self.assertTrue(isinstance(result, mpmath.mpf))
+ self.assertTrue(isinstance(result, sympy.mpmath.mpf))
def testJacobiTheta2(self):
- mpmath.mpf.dps = 100
- mpmath.mp.dps = 100
- testlimit = mpmath.mpf('10')**(-1*(mpmath.mpf.dps - 2))
+ sympy.mpmath.mpf.dps = 100
+ sympy.mpmath.mp.dps = 100
+ testlimit = sympy.mpmath.mpf('10')**(-1*(sympy.mpmath.mpf.dps - 2))
#print >> sys.stderr, testlimit
- zero = mpmath.mpf('0')
+ zero = sympy.mpmath.mpf('0')
#self.assertRaises(TypeError, jacobi_theta_2, 0, 0)
- z = mpmath.mpf('0')
- q = mpmath.mpf('0')
+ z = sympy.mpmath.mpf('0')
+ q = sympy.mpmath.mpf('0')
value = jacobi_theta_2(z, q)
- self.assertEquals(value, mpmath.mpf('0'))
+ self.assertEquals(value, sympy.mpmath.mpf('0'))
# Mathematica value for v2(z = 0.1, q = 0.1) = 1.12981
# q = 0.1, therefore m = 0.802403, according to Mathematica
- z = mpmath.mpf('0.1')
- m = mpmath.mpf('0.802403')
+ z = sympy.mpmath.mpf('0.1')
+ m = sympy.mpmath.mpf('0.802403')
result = jacobi_theta_2(z, m) # verbosity on
self.assertEquals(round(result, 5), 1.12981)
- z = mpmath.mpf('0')
- q = mpmath.pi / mpmath.mpf('2')
+ z = sympy.mpmath.mpf('0')
+ q = sympy.mpmath.pi / sympy.mpmath.mpf('2')
self.assertRaises(ValueError, jacobi_theta_1, z, q)
- q = mpmath.mpf('1')
+ q = sympy.mpmath.mpf('1')
self.assertRaises(ValueError, jacobi_theta_1, z, q)
- z = mpmath.mpf('0.1')
- q = mpmath.mpf('0.1')
+ z = sympy.mpmath.mpf('0.1')
+ q = sympy.mpmath.mpf('0.1')
value = jacobi_theta_2(z, q)
- self.assertTrue(isinstance(value, mpmath.mpf))
+ self.assertTrue(isinstance(value, sympy.mpmath.mpf))
def testJacobiTheta3(self):
- mpmath.mpf.dps = 100
- mpmath.mp.dps = 100
- testlimit = mpmath.mpf('10')**(-1*(mpmath.mpf.dps - 2))
+ sympy.mpmath.mpf.dps = 100
+ sympy.mpmath.mp.dps = 100
+ testlimit = sympy.mpmath.mpf('10')**(-1*(sympy.mpmath.mpf.dps - 2))
#print >> sys.stderr, testlimit
- one = mpmath.mpf('1')
+ one = sympy.mpmath.mpf('1')
#self.assertRaises(TypeError, jacobi_theta_2, 0, 0)
- z = mpmath.mpf('0')
- q = mpmath.mpf('0')
+ z = sympy.mpmath.mpf('0')
+ q = sympy.mpmath.mpf('0')
value = jacobi_theta_3(z, q)
- self.assertEquals(mpmath.mpf('1'), value)
- self.assertTrue(isinstance(value, mpmath.mpf))
+ self.assertEquals(sympy.mpmath.mpf('1'), value)
+ self.assertTrue(isinstance(value, sympy.mpmath.mpf))
# Mathematica value for v3(z = 0.1, q = 0.1) = 1.1962
# q = 0.1, therefore m = 0.802403, according to Mathematica
- z = mpmath.mpf('0.1')
- m = mpmath.mpf('0.802403')
+ z = sympy.mpmath.mpf('0.1')
+ m = sympy.mpmath.mpf('0.802403')
result = jacobi_theta_3(z, m)
self.assertEquals(round(result, 4), 1.1962)
- mpmath.mpf.dps = 2
- z = mpmath.mpf('0')
- q = mpmath.pi / mpmath.mpf('2')
+ sympy.mpmath.mpf.dps = 2
+ z = sympy.mpmath.mpf('0')
+ q = sympy.mpmath.pi / sympy.mpmath.mpf('2')
self.assertRaises(ValueError, jacobi_theta_1, z, q)
- q = mpmath.mpf('1')
+ q = sympy.mpmath.mpf('1')
self.assertRaises(ValueError, jacobi_theta_1, z, q)
- z = mpmath.mpf('0.1')
- q = mpmath.mpf('0.1')
+ z = sympy.mpmath.mpf('0.1')
+ q = sympy.mpmath.mpf('0.1')
value = jacobi_theta_2(z, q)
- self.assertTrue(isinstance(value, mpmath.mpf))
+ self.assertTrue(isinstance(value, sympy.mpmath.mpf))
def testJacobiTheta4(self):
- mpmath.mpf.dps = 100
- mpmath.mp.dps = 100
- testlimit = mpmath.mpf('10')**(-1*(mpmath.mpf.dps - 2))
+ sympy.mpmath.mpf.dps = 100
+ sympy.mpmath.mp.dps = 100
+ testlimit = sympy.mpmath.mpf('10')**(-1*(sympy.mpmath.mpf.dps - 2))
#print >> sys.stderr, testlimit
#self.assertRaises(TypeError, jacobi_theta_4, 0, 0)
- z = mpmath.mpf('0')
- q = mpmath.mpf('0')
+ z = sympy.mpmath.mpf('0')
+ q = sympy.mpmath.mpf('0')
value = jacobi_theta_4(z, q)
- self.assertEquals(value, mpmath.mpf('1.0'))
+ self.assertEquals(value, sympy.mpmath.mpf('1.0'))
# Mathematica value for v4(z = 0.1, q = 0.1) = 0.804171
# q = 0.1, therefore m = 0.802403, according to Mathematica
- z = mpmath.mpf('0.1')
- m = mpmath.mpf('0.802403')
+ z = sympy.mpmath.mpf('0.1')
+ m = sympy.mpmath.mpf('0.802403')
result = jacobi_theta_4(z, m)
self.assertEquals(round(result, 6), 0.804171)
- z = mpmath.mpf('0')
- q = mpmath.pi / mpmath.mpf('2')
+ z = sympy.mpmath.mpf('0')
+ q = sympy.mpmath.pi / sympy.mpmath.mpf('2')
self.assertRaises(ValueError, jacobi_theta_1, z, q)
- q = mpmath.mpf('1')
+ q = sympy.mpmath.mpf('1')
self.assertRaises(ValueError, jacobi_theta_1, z, q)
- z = mpmath.mpf('0.1')
- q = mpmath.mpf('0.1')
+ z = sympy.mpmath.mpf('0.1')
+ q = sympy.mpmath.mpf('0.1')
value = jacobi_theta_4(z, q)
- self.assertTrue(isinstance(value, mpmath.mpf))
+ self.assertTrue(isinstance(value, sympy.mpmath.mpf))
def testJacobiEllipticSn(self):
"""
@@ -185,15 +185,15 @@
This is an intensive test, so precision turned down during
development.
"""
- mpmath.mpf.dps = 100
- mpmath.mp.dps = 100
- #mpmath.mpf.dps = 20 # testing version
- #mpmath.mp.dps = 20
- testlimit = mpmath.mpf('10')**(-1*(mpmath.mpf.dps - 4))
+ sympy.mpmath.mpf.dps = 100
+ sympy.mpmath.mp.dps = 100
+ #sympy.mpmath.mpf.dps = 20 # testing version
+ #sympy.mpmath.mp.dps = 20
+ testlimit = sympy.mpmath.mpf('10')**(-1*(sympy.mpmath.mpf.dps - 4))
#print >> sys.stderr, testlimit
- zero = mpmath.mpf('0')
- one = mpmath.mpf('1')
+ zero = sympy.mpmath.mpf('0')
+ one = sympy.mpmath.mpf('1')
# trival case
result = jacobi_elliptic_sn(zero, zero)
@@ -203,10 +203,10 @@
#
# sn(K, m) = 1; K is K(k), first complete elliptic integral
mstring = str(random.random())
- m = mpmath.mpf(mstring)
+ m = sympy.mpmath.mpf(mstring)
k = m.sqrt()
- K = mpmath.ellipk(k**2)
+ K = sympy.mpmath.ellipk(k**2)
equality = abs(one - jacobi_elliptic_sn(K, m))
@@ -228,7 +228,7 @@
# case for sn function.
# Mathematica value for sn(z = 0.1, m = 0.1) = 0.0998169
- arg = mpmath.mpf('0.1')
+ arg = sympy.mpmath.mpf('0.1')
result = jacobi_elliptic_sn(arg, arg)
self.assertEquals(round(result, 7), 0.0998169)
@@ -239,22 +239,22 @@
This is an intensive test, so precision turned down during
development.
"""
- mpmath.mpf.dps = 100
- mpmath.mp.dps = 100
- #mpmath.mpf.dps = 20 # testing version
- #mpmath.mp.dps = 20
- testlimit = mpmath.mpf('10')**(-1*(mpmath.mpf.dps - 4))
+ sympy.mpmath.mpf.dps = 100
+ sympy.mpmath.mp.dps = 100
+ #sympy.mpmath.mpf.dps = 20 # testing version
+ #sympy.mpmath.mp.dps = 20
+ testlimit = sympy.mpmath.mpf('10')**(-1*(sympy.mpmath.mpf.dps - 4))
#print >> sys.stderr, testlimit
- zero = mpmath.mpf('0')
- one = mpmath.mpf('1')
+ zero = sympy.mpmath.mpf('0')
+ one = sympy.mpmath.mpf('1')
# Abramowitz Table 16.5
#
# cn(0, q) = 1
qstring = str(random.random())
- q = mpmath.mpf(qstring)
+ q = sympy.mpmath.mpf(qstring)
cn = jacobi_elliptic_cn(zero, q)
equality = one - cn
@@ -271,10 +271,10 @@
# cn(K, q) = 0; K is K(k), first complete elliptic integral
mstring = str(random.random())
- m = mpmath.mpf(mstring)
+ m = sympy.mpmath.mpf(mstring)
k = m.sqrt()
- K = mpmath.ellipk(k**2)
+ K = sympy.mpmath.ellipk(k**2)
equality = jacobi_elliptic_cn(K, m)
@@ -302,22 +302,22 @@
"""
Test some special cases of the dn(z, q) function.
"""
- mpmath.mpf.dps = 100
- mpmath.mp.dps = 100
- #mpmath.mpf.dps = 20 # testing version
- #mpmath.mp.dps = 20
- testlimit = mpmath.mpf('10')**(-1*(mpmath.mpf.dps - 4))
+ sympy.mpmath.mpf.dps = 100
+ sympy.mpmath.mp.dps = 100
+ #sympy.mpmath.mpf.dps = 20 # testing version
+ #sympy.mpmath.mp.dps = 20
+ testlimit = sympy.mpmath.mpf('10')**(-1*(sympy.mpmath.mpf.dps - 4))
#print >> sys.stderr, testlimit
- zero = mpmath.mpf('0')
- one = mpmath.mpf('1')
+ zero = sympy.mpmath.mpf('0')
+ one = sympy.mpmath.mpf('1')
# Abramowitz Table 16.5
#
# dn(0, q) = 1
mstring = str(random.random())
- m = mpmath.mpf(mstring)
+ m = sympy.mpmath.mpf(mstring)
dn = jacobi_elliptic_dn(zero, m)
equality = one - dn
@@ -337,7 +337,7 @@
# dn(z, 0) = 1, m == 0
zstring = str(random.random())
- z = mpmath.mpf(zstring)
+ z = sympy.mpmath.mpf(zstring)
value = jacobi_elliptic_dn(z, zero)
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_functions2.py
--- a/sympy/mpmath/tests/test_functions2.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_functions2.py Sun Oct 19 16:15:18 2008 +0200
@@ -1,5 +1,5 @@
import math
-from mpmath import *
+from sympy.mpmath import *
def test_bessel():
mp.dps = 15
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_gammazeta.py
--- a/sympy/mpmath/tests/test_gammazeta.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_gammazeta.py Sun Oct 19 16:15:18 2008 +0200
@@ -1,8 +1,8 @@
-from mpmath import *
-from mpmath.settings import round_up
+from sympy.mpmath import *
+from sympy.mpmath.settings import round_up
-from mpmath.libmpf import from_float
-from mpmath.gammazeta import mpf_zeta_int
+from sympy.mpmath.libmpf import from_float
+from sympy.mpmath.gammazeta import mpf_zeta_int
def test_zeta_int_bug():
assert mpf_zeta_int(0, 10) == from_float(-0.5)
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_hp.py
--- a/sympy/mpmath/tests/test_hp.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_hp.py Sun Oct 19 16:15:18 2008 +0200
@@ -5,7 +5,7 @@
"""
import time
-from mpmath import *
+from sympy.mpmath import *
precs = [5, 15, 28, 35, 57, 80, 100, 150, 200]
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_identify.py
--- a/sympy/mpmath/tests/test_identify.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_identify.py Sun Oct 19 16:15:18 2008 +0200
@@ -1,4 +1,4 @@
-from mpmath import *
+from sympy.mpmath import *
def test_pslq():
mp.dps = 15
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_interval.py
--- a/sympy/mpmath/tests/test_interval.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_interval.py Sun Oct 19 16:15:18 2008 +0200
@@ -1,4 +1,4 @@
-from mpmath import *
+from sympy.mpmath import *
def test_interval_identity():
mp.dps = 15
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_linalg.py
--- a/sympy/mpmath/tests/test_linalg.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_linalg.py Sun Oct 19 16:15:18 2008 +0200
@@ -2,10 +2,10 @@
from __future__ import division
-from mpmath.matrices import matrix, norm_p, mnorm_1, mnorm_oo, mnorm_F, \
+from sympy.mpmath.matrices import matrix, norm_p, mnorm_1, mnorm_oo, mnorm_F, \
randmatrix, eye, zeros
-from mpmath.linalg import * # TODO: absolute imports
-from mpmath.mptypes import *
+from sympy.mpmath.linalg import * # TODO: absolute imports
+from sympy.mpmath.mptypes import *
A1 = matrix([[3, 1, 6],
[2, 1, 3],
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_matrices.py
--- a/sympy/mpmath/tests/test_matrices.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_matrices.py Sun Oct 19 16:15:18 2008 +0200
@@ -1,7 +1,7 @@
-from mpmath.matrices import matrix, eye, swap_row, diag, mnorm_1, mnorm_oo, \
+from sympy.mpmath.matrices import matrix, eye, swap_row, diag, mnorm_1,
mnorm_oo, \
mnorm_F, norm_p, zeros, ones, randmatrix, extend
-from mpmath.linalg import inverse
-from mpmath import inf, mpf, sqrt, mpi
+from sympy.mpmath.linalg import inverse
+from sympy.mpmath import inf, mpf, sqrt, mpi
with_numpy = False
try:
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_mpmath.py
--- a/sympy/mpmath/tests/test_mpmath.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_mpmath.py Sun Oct 19 16:15:18 2008 +0200
@@ -1,8 +1,8 @@
# TODO: there are too many tests in this file. they should be separated.
-from mpmath.libmpf import *
-from mpmath.libelefun import *
-from mpmath import *
+from sympy.mpmath.libmpf import *
+from sympy.mpmath.libelefun import *
+from sympy.mpmath import *
import random
import time
import math
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_ode.py
--- a/sympy/mpmath/tests/test_ode.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_ode.py Sun Oct 19 16:15:18 2008 +0200
@@ -1,4 +1,4 @@
-from mpmath.calculus import ODE_step_euler, ODE_step_rk4, odeint, arange
+from sympy.mpmath.calculus import ODE_step_euler, ODE_step_rk4, odeint, arange
solvers = [ODE_step_euler, ODE_step_rk4]
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_pickle.py
--- a/sympy/mpmath/tests/test_pickle.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_pickle.py Sun Oct 19 16:15:18 2008 +0200
@@ -2,7 +2,7 @@
import tempfile
import pickle
-from mpmath import *
+from sympy.mpmath import *
def pickler(obj):
fn = tempfile.mktemp()
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_power.py
--- a/sympy/mpmath/tests/test_power.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_power.py Sun Oct 19 16:15:18 2008 +0200
@@ -1,6 +1,6 @@
-from mpmath import *
-from mpmath.libmpf import *
-from mpmath.libelefun import *
+from sympy.mpmath import *
+from sympy.mpmath.libmpf import *
+from sympy.mpmath.libelefun import *
import random
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_quad.py
--- a/sympy/mpmath/tests/test_quad.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_quad.py Sun Oct 19 16:15:18 2008 +0200
@@ -1,4 +1,4 @@
-from mpmath import *
+from sympy.mpmath import *
def ae(a, b):
return abs(a-b) < 10**(-mp.dps+5)
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_rootfinding.py
--- a/sympy/mpmath/tests/test_rootfinding.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_rootfinding.py Sun Oct 19 16:15:18 2008 +0200
@@ -1,5 +1,5 @@
-from mpmath import *
-from mpmath.optimization import *
+from sympy.mpmath import *
+from sympy.mpmath.optimization import *
def test_findroot():
# old tests, assuming secant
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_special.py
--- a/sympy/mpmath/tests/test_special.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_special.py Sun Oct 19 16:15:18 2008 +0200
@@ -1,4 +1,4 @@
-from mpmath import *
+from sympy.mpmath import *
def test_special():
assert inf == inf
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_summation.py
--- a/sympy/mpmath/tests/test_summation.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_summation.py Sun Oct 19 16:15:18 2008 +0200
@@ -1,4 +1,4 @@
-from mpmath import *
+from sympy.mpmath import *
def test_sumem():
f = lambda x: x**-3
diff -r 6508c8b55d7b -r b24fc7dacb62 sympy/mpmath/tests/test_trig.py
--- a/sympy/mpmath/tests/test_trig.py Sun Oct 19 16:15:17 2008 +0200
+++ b/sympy/mpmath/tests/test_trig.py Sun Oct 19 16:15:18 2008 +0200
@@ -1,5 +1,5 @@
-from mpmath import *
-from mpmath.libmpf import *
+from sympy.mpmath import *
+from sympy.mpmath.libmpf import *
def test_trig_misc_hard():
mp.prec = 150
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"sympy-commits" group.
To post to this group, send email to sympy-commits@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/sympy-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
