diff options
| author | wtli@Dirac <liwt31@163.com> | 2018-10-22 22:30:32 +0800 |
|---|---|---|
| committer | wtli@Dirac <liwt31@163.com> | 2018-10-23 16:29:35 +0800 |
| commit | be5ea7d92d542e7c7eb055c5831a79850f4bfbee (patch) | |
| tree | 2bb66021c49d699da81d89b331e7610c1cd177b2 /numpy/testing/_private | |
| parent | db5750f6cdc2715f1c65be31f985e2cd2699d2e0 (diff) | |
| download | numpy-be5ea7d92d542e7c7eb055c5831a79850f4bfbee.tar.gz | |
BUG: Fix misleading assert message in assert_almost_equal #12200
Fixes #12200 by making a copy of the matrix before NaN's are excluded.
Add a test for it.
Diffstat (limited to 'numpy/testing/_private')
| -rw-r--r-- | numpy/testing/_private/utils.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/numpy/testing/_private/utils.py b/numpy/testing/_private/utils.py index a3832fcde..24b32cf00 100644 --- a/numpy/testing/_private/utils.py +++ b/numpy/testing/_private/utils.py @@ -692,6 +692,9 @@ def assert_array_compare(comparison, x, y, err_msg='', verbose=True, x = array(x, copy=False, subok=True) y = array(y, copy=False, subok=True) + # original array for output formating + ox, oy = x, y + def isnumber(x): return x.dtype.char in '?bhilqpBHILQPefdgFDG' @@ -780,10 +783,10 @@ def assert_array_compare(comparison, x, y, err_msg='', verbose=True, # do not trigger a failure (np.ma.masked != True evaluates as # np.ma.masked, which is falsy). if cond != True: - match = 100-100.0*reduced.count(1)/len(reduced) - msg = build_err_msg([x, y], + mismatch = 100.0 * reduced.count(0) / ox.size + msg = build_err_msg([ox, oy], err_msg - + '\n(mismatch %s%%)' % (match,), + + '\n(mismatch %s%%)' % (mismatch,), verbose=verbose, header=header, names=('x', 'y'), precision=precision) raise AssertionError(msg) |
