diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2016-10-28 11:08:40 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-28 11:08:40 -0400 |
commit | e908bfa9977a45b311ef09f03551aa1780686739 (patch) | |
tree | 921f6aa27d01ba8817089b092093726bae962111 /numpy/lib/tests/test_arraysetops.py | |
parent | f303ccebaa2953e506c4991825cda2ac8b5d2fb9 (diff) | |
parent | 9a90abf995d0d8d9e96992a083dc55a41a93254f (diff) | |
download | python-numpy-e908bfa9977a45b311ef09f03551aa1780686739.tar.gz python-numpy-e908bfa9977a45b311ef09f03551aa1780686739.tar.bz2 python-numpy-e908bfa9977a45b311ef09f03551aa1780686739.zip |
Merge pull request #8218 from mattharrigan/ediff1d-performance
BUG: ediff1d should return subclasses
Diffstat (limited to 'numpy/lib/tests/test_arraysetops.py')
-rw-r--r-- | numpy/lib/tests/test_arraysetops.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/numpy/lib/tests/test_arraysetops.py b/numpy/lib/tests/test_arraysetops.py index b75a2b060..75918fbee 100644 --- a/numpy/lib/tests/test_arraysetops.py +++ b/numpy/lib/tests/test_arraysetops.py @@ -175,6 +175,8 @@ class TestSetOps(TestCase): assert_array_equal([1,7,8], ediff1d(two_elem, to_end=[7,8])) assert_array_equal([7,1], ediff1d(two_elem, to_begin=7)) assert_array_equal([5,6,1], ediff1d(two_elem, to_begin=[5,6])) + assert(isinstance(ediff1d(np.matrix(1)), np.matrix)) + assert(isinstance(ediff1d(np.matrix(1), to_begin=1), np.matrix)) def test_in1d(self): # we use two different sizes for the b array here to test the |