8000 correct behaviour for assert_array_less with inf/nan by AnishShah · Pull Request #7135 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

correct behaviour for assert_array_less with inf/nan #7135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

correct behaviour for assert_array_less with inf/nan #7135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions numpy/testing/tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

import numpy as np
from numpy.testing import (
assert_equal, assert_array_equal, assert_almost_equal,
assert_equal, assert_array_equal, assert_almost_equal, assert_array_less,
assert_array_almost_equal, build_err_msg, raises, assert_raises,
assert_warns, assert_no_warnings, assert_allclose, assert_approx_equal,
assert_array_almost_equal_nulp, assert_array_max_ulp,
clear_and_catch_warnings, run_module_suite,
assert_string_equal, assert_, tempdir, temppath,
assert_string_equal, assert_, tempdir, temppath,
)
import unittest

Expand Down Expand Up @@ -335,6 +335,45 @@ def test_error_message(self):
self.assertEqual(str(e).split('%)\n ')[1], b)


class TestArrayLess(unittest.TestCase):

def setUp(self):
self._assert_func = assert_array_less

def test_simple(self):
a = 1
b = [2, 3, 4]
self._assert_func(a, b)
a = [1, 0, 1]
self._assert_func(a, b)
a = [1]
self.assertRaises(AssertionError,
lambda: self._assert_func(a, b))

def test_nan(self):
a = [1, np.nan]
b = [2, np.nan]
self._assert_func(a, b)
a = [np.nan, 1]
self.assertRaises(AssertionError,
lambda: self._assert_func(a, b))

def test_inf(self):
a = 2
b = np.inf
self._assert_func(a, b)
a = [ 0.911, 1.065, 1.325, 1.587]
self._assert_func(a, b)
a.append(np.inf)
self.assertRaises(AssertionError,
lambda: self._assert_func(a, b))
self._assert_func(-np.inf, np.inf)
a = [1, np.inf]
b = [2, np.inf]
self.assertRaises(AssertionError,
lambda: self._assert_func(a, b))


class TestApproxEqual(unittest.TestCase):

def setUp(self):
Expand Down
11 changes: 2 additions & 9 deletions numpy/testing/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,20 +689,13 @@ def chk_same_position(x_id, y_id, hasval='nan'):

if isnumber(x) and isnumber(y):
x_isnan, y_isnan = isnan(x), isnan(y)
x_isinf, y_isinf = isinf(x), isinf(y)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What was the motivation to remove the checks for +/-infinity (these lines and all the ones below)?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Previous logic for assert_array_compare was if there was inf in x or y, it should be at the same location (array id). It just checks the location of inf, it does not do any sort of comparison, which is wrong.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So just for my edification, you are relying on all of the following being true?

+inf == +inf
-inf == -inf
-inf < +inf
-inf < some_finite_number
some_finite_number < +inf

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the explanation.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

# Validate that the special values are in the same place
if any(x_isnan) or any(y_isnan):
chk_same_position(x_isnan, y_isnan, hasval='nan')
if any(x_isinf) or any(y_isinf):
# Check +inf and -inf separately, since they are different
chk_same_position(x == +inf, y == +inf, hasval='+inf')
chk_same_position(x == -inf, y == -inf, hasval='-inf')

# Combine all the special values
x_id, y_id = x_isnan, y_isnan
x_id |= x_isinf
y_id |= y_isinf

# Only do the comparison if actual values are left
if all(x_id):
Expand Down Expand Up @@ -886,7 +879,7 @@ def compare(x, y):
if npany(gisinf(x)) or npany( gisinf(y)):
xinfid = gisinf(x)
yinfid = gisinf(y)
if not xinfid == yinfid:
if not (xinfid == yinfid).all():
return False
# if one item, x and y is +- inf
if x.size == y.size == 1:
Expand Down Expand Up @@ -1863,7 +1856,7 @@ def temppath(*args, **kwargs):
parameters are the same as for tempfile.mkstemp and are passed directly
to that function. The underlying file is removed when the context is
exited, so it should be closed at that time.

Windows does not allow a temporary file to be opened if it is already
open, so the underlying file must be closed after opening before it
can be opened again.
Expand Down
0