diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-01-02 16:51:42 -0500 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-01-02 16:51:42 -0500 |
| commit | 7fbc43b98d59ef982671b456cebc229425ae7e4e (patch) | |
| tree | 7f34064ec1facebc7ca341666ab9f0b53dd5e481 /numpy/matrixlib/tests/test_defmatrix.py | |
| parent | d2b6e96f48df28fe346c6ac6fa35b2ac324ef2f6 (diff) | |
| parent | 78f69df28acd80654705a43bcf1e977b9c423b53 (diff) | |
| download | numpy-7fbc43b98d59ef982671b456cebc229425ae7e4e.tar.gz | |
Merge pull request #5398 from Garrett-R/fix_5376
BUG: Fixes #5376: np.ravel to return same array type
Diffstat (limited to 'numpy/matrixlib/tests/test_defmatrix.py')
| -rw-r--r-- | numpy/matrixlib/tests/test_defmatrix.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/numpy/matrixlib/tests/test_defmatrix.py b/numpy/matrixlib/tests/test_defmatrix.py index d2a89bd51..93843c55c 100644 --- a/numpy/matrixlib/tests/test_defmatrix.py +++ b/numpy/matrixlib/tests/test_defmatrix.py @@ -409,7 +409,7 @@ class TestShape(TestCase): def test_numpy_ravel(self): assert_equal(np.ravel(self.a).shape, (2,)) - assert_equal(np.ravel(self.m).shape, (2,)) + assert_equal(np.ravel(self.m).shape, (1, 2)) def test_member_ravel(self): assert_equal(self.a.ravel().shape, (2,)) @@ -420,12 +420,16 @@ class TestShape(TestCase): assert_equal(self.m.flatten().shape, (1, 2)) def test_numpy_ravel_order(self): - for t in array, matrix: - x = t([[1, 2, 3], [4, 5, 6]]) - assert_equal(np.ravel(x), [1, 2, 3, 4, 5, 6]) - assert_equal(np.ravel(x, order='F'), [1, 4, 2, 5, 3, 6]) - assert_equal(np.ravel(x.T), [1, 4, 2, 5, 3, 6]) - assert_equal(np.ravel(x.T, order='A'), [1, 2, 3, 4, 5, 6]) + x = array([[1, 2, 3], [4, 5, 6]]) + assert_equal(np.ravel(x), [1, 2, 3, 4, 5, 6]) + assert_equal(np.ravel(x, order='F'), [1, 4, 2, 5, 3, 6]) + assert_equal(np.ravel(x.T), [1, 4, 2, 5, 3, 6]) + assert_equal(np.ravel(x.T, order='A'), [1, 2, 3, 4, 5, 6]) + x = matrix([[1, 2, 3], [4, 5, 6]]) + assert_equal(np.ravel(x), [[1, 2, 3, 4, 5, 6]]) + assert_equal(np.ravel(x, order='F'), [[1, 4, 2, 5, 3, 6]]) + assert_equal(np.ravel(x.T), [[1, 4, 2, 5, 3, 6]]) + assert_equal(np.ravel(x.T, order='A'), [[1, 2, 3, 4, 5, 6]]) def test_matrix_ravel_order(self): x = matrix([[1, 2, 3], [4, 5, 6]]) |