diff options
| author | Marten van Kerkwijk <mhvk@astro.utoronto.ca> | 2017-01-11 10:36:21 -0500 |
|---|---|---|
| committer | Marten van Kerkwijk <mhvk@astro.utoronto.ca> | 2017-01-11 12:23:35 -0500 |
| commit | 960ec0a4eab51ccc33e6a030d870f93300656df4 (patch) | |
| tree | 2618102c9152641e1c3f58eac3dafc957418977e /numpy/testing/tests | |
| parent | 124c3d809d5b2cca79957299ed126efd1300dffe (diff) | |
| download | python-numpy-960ec0a4eab51ccc33e6a030d870f93300656df4.tar.gz python-numpy-960ec0a4eab51ccc33e6a030d870f93300656df4.tar.bz2 python-numpy-960ec0a4eab51ccc33e6a030d870f93300656df4.zip | |
Ensure inf/nan removal in assert_array_compare is matrix-safe.
Diffstat (limited to 'numpy/testing/tests')
| -rw-r--r-- | numpy/testing/tests/test_utils.py | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/numpy/testing/tests/test_utils.py b/numpy/testing/tests/test_utils.py index a05fc3bdb..804f22b7f 100644 --- a/numpy/testing/tests/test_utils.py +++ b/numpy/testing/tests/test_utils.py @@ -303,6 +303,20 @@ class TestArrayAlmostEqual(_GenericTest, unittest.TestCase): self._assert_func(b, a) self._assert_func(b, b) + def test_matrix(self): + # Matrix slicing keeps things 2-D, while array does not necessarily. + # See gh-8452. + m1 = np.matrix([[1., 2.]]) + m2 = np.matrix([[1., np.nan]]) + m3 = np.matrix([[1., -np.inf]]) + m4 = np.matrix([[np.nan, np.inf]]) + m5 = np.matrix([[1., 2.], [np.nan, np.inf]]) + for m in m1, m2, m3, m4, m5: + self._assert_func(m, m) + a = np.array(m) + self._assert_func(a, m) + self._assert_func(m, a) + def test_subclass_that_cannot_be_bool(self): # While we cannot guarantee testing functions will always work for # subclasses, the tests should ideally rely only on subclasses having @@ -402,6 +416,20 @@ class TestAlmostEqual(_GenericTest, unittest.TestCase): # remove anything that's not the array string self.assertEqual(str(e).split('%)\n ')[1], b) + def test_matrix(self): + # Matrix slicing keeps things 2-D, while array does not necessarily. + # See gh-8452. + m1 = np.matrix([[1., 2.]]) + m2 = np.matrix([[1., np.nan]]) + m3 = np.matrix([[1., -np.inf]]) + m4 = np.matrix([[np.nan, np.inf]]) + m5 = np.matrix([[1., 2.], [np.nan, np.inf]]) + for m in m1, m2, m3, m4, m5: + self._assert_func(m, m) + a = np.array(m) + self._assert_func(a, m) + self._assert_func(m, a) + def test_subclass_that_cannot_be_bool(self): # While we cannot guarantee testing functions will always work for # subclasses, the tests should ideally rely only on subclasses having |