diff options
Diffstat (limited to 'numpy/lib')
| -rw-r--r-- | numpy/lib/arraysetops.py | 3 | ||||
| -rw-r--r-- | numpy/lib/tests/test_arraysetops.py | 26 |
2 files changed, 20 insertions, 9 deletions
diff --git a/numpy/lib/arraysetops.py b/numpy/lib/arraysetops.py index 7597866a4..f0cc2006c 100644 --- a/numpy/lib/arraysetops.py +++ b/numpy/lib/arraysetops.py @@ -619,7 +619,8 @@ def in1d(ar1, ar2, assume_unique=False, invert=False, _slow_integer=None): ar2_range = ar2_max - ar2_min # Optimal performance is for approximately - # log10(size) > (log10(range) - 2.27) / 0.927, see discussion on + # log10(size) > (log10(range) - 2.27) / 0.927. + # See discussion on # https://github.com/numpy/numpy/pull/12065 optimal_parameters = ( np.log10(ar2_size) > diff --git a/numpy/lib/tests/test_arraysetops.py b/numpy/lib/tests/test_arraysetops.py index 8de1cee6f..60d9b7c87 100644 --- a/numpy/lib/tests/test_arraysetops.py +++ b/numpy/lib/tests/test_arraysetops.py @@ -435,10 +435,16 @@ class TestSetOps: assert_array_equal(in1d(a, b, assume_unique=False), ec) assert_array_equal(in1d(a, long_b, assume_unique=True), ec) assert_array_equal(in1d(a, long_b, assume_unique=False), ec) - assert_array_equal(in1d(a, b, assume_unique=True, _slow_integer=True), ec) - assert_array_equal(in1d(a, b, assume_unique=False, _slow_integer=True), ec) - assert_array_equal(in1d(a, long_b, assume_unique=True, _slow_integer=True), ec) - assert_array_equal(in1d(a, long_b, assume_unique=False, _slow_integer=True), ec) + assert_array_equal(in1d(a, b, assume_unique=True, _slow_integer=True), + ec) + assert_array_equal(in1d(a, b, assume_unique=False, _slow_integer=True), + ec) + assert_array_equal(in1d(a, long_b, assume_unique=True, + _slow_integer=True), + ec) + assert_array_equal(in1d(a, long_b, assume_unique=False, + _slow_integer=True), + ec) def test_in1d_hit_alternate_algorithm(self): """Hit the standard isin code with integers""" @@ -461,10 +467,14 @@ class TestSetOps: a = np.array([True, False]) b = np.array([False, False, False]) expected = np.array([False, True]) - assert_array_equal(expected, in1d(a, b)) - assert_array_equal(expected, in1d(a, b, _slow_integer=True)) - assert_array_equal(np.invert(expected), in1d(a, b, invert=True)) - assert_array_equal(np.invert(expected), in1d(a, b, invert=True, _slow_integer=True)) + assert_array_equal(expected, + in1d(a, b)) + assert_array_equal(expected, + in1d(a, b, _slow_integer=True)) + assert_array_equal(np.invert(expected), + in1d(a, b, invert=True)) + assert_array_equal(np.invert(expected), + in1d(a, b, invert=True, _slow_integer=True)) def test_in1d_first_array_is_object(self): ar1 = [None] |