summaryrefslogtreecommitdiff
path: root/scipy/base/function_base.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2005-10-02 03:51:44 +0000
committerTravis Oliphant <oliphant@enthought.com>2005-10-02 03:51:44 +0000
commitfb0ceff29f606d51c396521f8bee36d414e1cca4 (patch)
treefaaa6aef79ea6ddeb4ad6ee9ee8b96ee20223c67 /scipy/base/function_base.py
parent0e1c0c01b93cfd521dbce975b1cd28517d2f151f (diff)
downloadnumpy-fb0ceff29f606d51c396521f8bee36d414e1cca4.tar.gz
Fixes by Eric Firing..
Diffstat (limited to 'scipy/base/function_base.py')
-rw-r--r--scipy/base/function_base.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/scipy/base/function_base.py b/scipy/base/function_base.py
index db6d703e4..1171da49a 100644
--- a/scipy/base/function_base.py
+++ b/scipy/base/function_base.py
@@ -553,7 +553,7 @@ def nanmin(x,axis=-1):
"""
y = array(x)
if not issubclass(y.dtype, _nx.integer):
- y[isnan(x)] = nx.inf
+ y[isnan(x)] = _nx.inf
return y.min(axis)
def nanargmin(x,axis=-1):
@@ -561,7 +561,7 @@ def nanargmin(x,axis=-1):
"""
y = array(x)
if not issubclass(y.dtype, _nx.integer):
- y[isnan(x)] = nx.inf
+ y[isnan(x)] = _nx.inf
return y.argmin(axis)
def nanmax(x,axis=-1):
@@ -569,7 +569,7 @@ def nanmax(x,axis=-1):
"""
y = array(x)
if not issubclass(y.dtype, _nx.integer):
- y[isnan(x)] = -nx.inf
+ y[isnan(x)] = -_nx.inf
return y.max(axis)
def nanargmax(x,axis=-1):
@@ -577,7 +577,7 @@ def nanargmax(x,axis=-1):
"""
y = array(x)
if not issubclass(y.dtype, _nx.integer):
- y[isnan(x)] = -nx.inf
+ y[isnan(x)] = -_nx.inf
return y.argmax(axis)
def disp(mesg, device=None, linefeed=1):