diff options
| author | Marten van Kerkwijk <mhvk@astro.utoronto.ca> | 2013-10-13 22:39:40 -0400 |
|---|---|---|
| committer | Marten van Kerkwijk <mhvk@astro.utoronto.ca> | 2013-10-13 22:39:40 -0400 |
| commit | 83fb19e7f37502df72d4c4865138f7d84de7c517 (patch) | |
| tree | 3c06020edf2780870e1bc09970936df3f6337476 /numpy/core/numeric.py | |
| parent | 4dbf3fe9ae3c0f06dd129646baa7a4f6e498291d (diff) | |
| download | numpy-83fb19e7f37502df72d4c4865138f7d84de7c517.tar.gz | |
Ensure masked arrays are treated correctly for isclose(..,..,equal_nan=True)
Diffstat (limited to 'numpy/core/numeric.py')
| -rw-r--r-- | numpy/core/numeric.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index 1aa59ce58..53254ec6a 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -2216,7 +2216,8 @@ def isclose(a, b, rtol=1.e-5, atol=1.e-8, equal_nan=False): cond[~finite] = (x[~finite] == y[~finite]) if equal_nan: # Make NaN == NaN - cond[isnan(x) & isnan(y)] = True + both_nan = isnan(x) & isnan(y) + cond[both_nan] = both_nan[both_nan] return cond def array_equal(a1, a2): |