[Scipy-svn] r3055 - in trunk/Lib/special: . tests

[scipy-svn at scipy.org]

Author: stefan
Date: 2007-05-29 04:10:20 -0500 (Tue, 29 May 2007)
New Revision: 3055

Modified:
   trunk/Lib/special/basic.py
   trunk/Lib/special/tests/test_basic.py
Log:
Fix special functions for real arguments (ticket #387).


Modified: trunk/Lib/special/basic.py
===================================================================
--- trunk/Lib/special/basic.py	2007-05-28 11:24:04 UTC (rev 3054)
+++ trunk/Lib/special/basic.py	2007-05-29 09:10:20 UTC (rev 3055)
@@ -216,7 +216,7 @@
         raise ValueError, "n must be a non-negative integer."
     if (n < 1): n1 = 1
     else: n1 = n
-    if any(iscomplex(z)):
+    if iscomplex(z):
         nm,jn,jnp,yn,ynp = specfun.csphjy(n1,z)
     else:
         nm,jn,jnp = specfun.sphj(n1,z)
@@ -232,7 +232,8 @@
         raise ValueError, "n must be a non-negative integer."
     if (n < 1): n1 = 1
     else: n1 = n
-    if any(iscomplex(z)) or any(z<0):
+    print z
+    if iscomplex(z) or less(z,0):
         nm,jn,jnp,yn,ynp = specfun.csphjy(n1,z)
     else:
         nm,yn,ynp = specfun.sphy(n1,z)
@@ -248,7 +249,7 @@
         raise ValueError, "n must be a non-negative integer."
     if (n < 1): n1 = 1
     else: n1 = n
-    if any(iscomplex(z)) or any(z<0):
+    if iscomplex(z) or less(z,0):
         nm,jn,jnp,yn,ynp = specfun.csphjy(n1,z)
     else:
         nm,yn,ynp = specfun.sphy(n1,z)
@@ -265,7 +266,7 @@
         raise ValueError, "n must be a non-negative integer."
     if (n < 1): n1 = 1
     else: n1 = n
-    if any(iscomplex(z)):
+    if iscomplex(z):
         nm,In,Inp,kn,knp = specfun.csphik(n1,z)
     else:
         nm,In,Inp = specfun.sphi(n1,z)
@@ -281,7 +282,7 @@
         raise ValueError, "n must be a non-negative integer."
     if (n < 1): n1 = 1
     else: n1 = n
-    if any(iscomplex(z)) or any(z<0):
+    if iscomplex(z) or less(z,0):
         nm,In,Inp,kn,knp = specfun.csphik(n1,z)
     else:
         nm,kn,knp = specfun.sphk(n1,z)
@@ -295,7 +296,7 @@
         raise ValueError, "arguments must be scalars."
     if (n!= floor(n)) or (n<0):
         raise ValueError, "n must be a non-negative integer."
-    if any(iscomplex(z)) or any(z<0):
+    if iscomplex(z) or less(z,0):
         nm,In,Inp,kn,knp = specfun.csphik(n,z)
     else:
         nm,In,Inp = specfun.sphi(n,z)
@@ -508,7 +509,7 @@
         sv = errprint(sv)
     else:
         mp = m
-    if any(iscomplex(z)):
+    if iscomplex(z):
         p,pd = specfun.clpmn(mp,n,real(z),imag(z))
     else:
         p,pd = specfun.lpmn(mp,n,z)
@@ -538,7 +539,7 @@
     if (m*n == 0):
         mm = max(1,m)
         nn = max(1,n)
-    if any(iscomplex(z)):
+    if iscomplex(z):
         q,qd = specfun.clqmn(mm,nn,z)
     else:
         q,qd = specfun.lqmn(mm,nn,z)
@@ -577,7 +578,7 @@
         raise ValueError, "n must be a non-negative integer."
     if (n < 1): n1 = 1
     else: n1 = n
-    if any(iscomplex(z)):
+    if iscomplex(z):
         pn,pd = specfun.clpn(n1,z)
     else:
         pn,pd = specfun.lpn(n1,z)
@@ -595,7 +596,7 @@
         raise ValueError, "n must be a non-negative integer."
     if (n < 1): n1 = 1
     else: n1 = n
-    if any(iscomplex(z)):
+    if iscomplex(z):
         qn,qd = specfun.clqn(n1,z)
     else:
         qn,qd = specfun.lqnb(n1,z)

Modified: trunk/Lib/special/tests/test_basic.py
===================================================================
--- trunk/Lib/special/tests/test_basic.py	2007-05-28 11:24:04 UTC (rev 3054)
+++ trunk/Lib/special/tests/test_basic.py	2007-05-29 09:10:20 UTC (rev 3055)
@@ -37,7 +37,7 @@
 from numpy.testing import *
 set_package_path()
 from special import *
-import special._cephes as cephes
+import scipy.special._cephes as cephes
 restore_path()