diff options
| author | Johannes Schönberger <hannesschoenberger@gmail.com> | 2013-01-13 12:53:36 +0100 |
|---|---|---|
| committer | Johannes Schönberger <jschoenberger@demuc.de> | 2013-06-06 21:15:44 +0200 |
| commit | a6772327279d39fb5e8637fb807451879d1cf828 (patch) | |
| tree | f1835c32fc9c3522853091fdc91c6f280a2a9736 | |
| parent | 474ec4858cd3b6a09cd8bec01c67759d95896cca (diff) | |
| download | numpy-a6772327279d39fb5e8637fb807451879d1cf828.tar.gz | |
Use commin method to compare array values
| -rw-r--r-- | numpy/core/tests/test_numeric.py | 56 |
1 files changed, 16 insertions, 40 deletions
diff --git a/numpy/core/tests/test_numeric.py b/numpy/core/tests/test_numeric.py index 971bb94fb..a2c321eb3 100644 --- a/numpy/core/tests/test_numeric.py +++ b/numpy/core/tests/test_numeric.py @@ -1356,6 +1356,18 @@ class TestLikeFuncs(TestCase): (arange(24).reshape(4,3,2).swapaxes(0,1), '?'), ] + def compare_array_value(self, dz, value, fill_value): + if not value is None: + if fill_value: + try: + z = dz.dtype.type(value) + except OverflowError: + pass + else: + assert_(all(dz == z)) + else: + assert_(all(dz == value)) + def check_like_function(self, like_function, value, fill_value=False): if fill_value: fill_kwarg = {'val': value} @@ -1373,16 +1385,7 @@ class TestLikeFuncs(TestCase): assert_equal(dz.dtype, d.dtype) else: assert_equal(dz.dtype, np.dtype(dtype)) - if not value is None: - if fill_value: - try: - z = dz.dtype.type(value) - except OverflowError: - pass - else: - assert_(all(dz == z)) - else: - assert_(all(dz == value)) + self.compare_array_value(dz, value, fill_value) # C order, default dtype dz = like_function(d, order='C', dtype=dtype, **fill_kwarg) @@ -1392,16 +1395,7 @@ class TestLikeFuncs(TestCase): assert_equal(dz.dtype, d.dtype) else: assert_equal(dz.dtype, np.dtype(dtype)) - if not value is None: - if fill_value: - try: - z = dz.dtype.type(value) - except OverflowError: - pass - else: - assert_(all(dz == z)) - else: - assert_(all(dz == value)) + self.compare_array_value(dz, value, fill_value) # F order, default dtype dz = like_function(d, order='F', dtype=dtype, **fill_kwarg) @@ -1411,16 +1405,7 @@ class TestLikeFuncs(TestCase): assert_equal(dz.dtype, d.dtype) else: assert_equal(dz.dtype, np.dtype(dtype)) - if not value is None: - if fill_value: - try: - z = dz.dtype.type(value) - except OverflowError: - pass - else: - assert_(all(dz == z)) - else: - assert_(all(dz == value)) + self.compare_array_value(dz, value, fill_value) # A order dz = like_function(d, order='A', dtype=dtype, **fill_kwarg) @@ -1433,16 +1418,7 @@ class TestLikeFuncs(TestCase): assert_equal(dz.dtype, d.dtype) else: assert_equal(dz.dtype, np.dtype(dtype)) - if not value is None: - if fill_value: - try: - z = dz.dtype.type(value) - except OverflowError: - pass - else: - assert_(all(dz == z)) - else: - assert_(all(dz == value)) + self.compare_array_value(dz, value, fill_value) # Test the 'subok' parameter a = np.matrix([[1,2],[3,4]]) |