summaryrefslogtreecommitdiff
path: root/numpy/lib/nanfunctions.py
diff options
context:
space:
mode:
authorMarten van Kerkwijk <mhvk@astro.utoronto.ca>2014-04-20 16:47:43 -0400
committerMarten van Kerkwijk <mhvk@astro.utoronto.ca>2014-04-20 16:47:43 -0400
commit5348c0210dd02b53e5e0e042f56976c7cd2ae002 (patch)
treed47fd135c6d0154199e7e8cb1b9d5bd9c8ab59a8 /numpy/lib/nanfunctions.py
parent61c699e5e1bf8b4b85ffd72a99691138d5674b50 (diff)
downloadnumpy-5348c0210dd02b53e5e0e042f56976c7cd2ae002.tar.gz
BUG: incorrect argument order to _copyto in in np.nanmax, np.nanmin
Diffstat (limited to 'numpy/lib/nanfunctions.py')
-rw-r--r--numpy/lib/nanfunctions.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/lib/nanfunctions.py b/numpy/lib/nanfunctions.py
index 5766084ab..badba32da 100644
--- a/numpy/lib/nanfunctions.py
+++ b/numpy/lib/nanfunctions.py
@@ -228,7 +228,7 @@ def nanmin(a, axis=None, out=None, keepdims=False):
# Check for all-NaN axis
mask = np.all(mask, axis=axis, keepdims=keepdims)
if np.any(mask):
- res = _copyto(res, mask, np.nan)
+ res = _copyto(res, np.nan, mask)
warnings.warn("All-NaN axis encountered", RuntimeWarning)
return res
@@ -327,7 +327,7 @@ def nanmax(a, axis=None, out=None, keepdims=False):
# Check for all-NaN axis
mask = np.all(mask, axis=axis, keepdims=keepdims)
if np.any(mask):
- res = _copyto(res, mask, np.nan)
+ res = _copyto(res, np.nan, mask)
warnings.warn("All-NaN axis encountered", RuntimeWarning)
return res