diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2014-04-22 18:31:32 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2014-04-22 18:31:32 -0600 |
| commit | d0b3f8f4213ee2d285be7d410a0cd7a1a601a7bd (patch) | |
| tree | 91cba85428a9a9f7cdaae5971569d314944ec92d /numpy/lib/nanfunctions.py | |
| parent | dd192e6ce7a99d1c24861d2875af18fced072ac9 (diff) | |
| parent | ff459fd2dc3641486b35c672e0d48855669a13a5 (diff) | |
| download | numpy-d0b3f8f4213ee2d285be7d410a0cd7a1a601a7bd.tar.gz | |
Merge pull request #4628 from mhvk/nanfunctions-copyto-call
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.py | 4 |
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 |