summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPearu Peterson <pearu.peterson@gmail.com>2005-10-26 22:08:31 +0000
committerPearu Peterson <pearu.peterson@gmail.com>2005-10-26 22:08:31 +0000
commit4fb4bd40b51e41aca4495a2c79dfad5b4cd9279f (patch)
tree62f5e49018992e1e17d0756f16e348a9c20b48e6
parent4e917206d27330ce59e19098385477a285b85062 (diff)
downloadnumpy-4fb4bd40b51e41aca4495a2c79dfad5b4cd9279f.tar.gz
Bug fixes.
-rw-r--r--scipy/base/scimath.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/scipy/base/scimath.py b/scipy/base/scimath.py
index 18d75b2df..0f0f5d0ac 100644
--- a/scipy/base/scimath.py
+++ b/scipy/base/scimath.py
@@ -11,7 +11,7 @@ __all__ = ['sqrt', 'log', 'log2','logn','log10', 'power', 'arccos',
import numeric as _nx
from numeric import *
-from type_check import isreal
+from type_check import isreal, asscalar
__all__.extend([key for key in dir(_nx.umath) \
if key[0]!='_' and key not in __all__])
@@ -38,15 +38,15 @@ def _fix_real_abs_gt_1(x):
def sqrt(x):
x = _fix_real_lt_zero(x)
- return sqrt(x)
+ return _nx.sqrt(x)
def log(x):
x = _fix_real_lt_zero(x)
- return log(x)
+ return _nx.log(x)
def log10(x):
x = _fix_real_lt_zero(x)
- return log10(x)
+ return _nx.log10(x)
def logn(n,x):
""" Take log base n of x.
@@ -63,7 +63,7 @@ def log2(x):
def power(x, p):
x = _fix_real_lt_zero(x)
- return power(x, p)
+ return _nx.power(x, p)
def arccos(x):