diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2018-09-21 16:50:04 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2018-09-21 16:50:04 +0200 |
| commit | 1bf12880ae65dcf6215354b3383e419ef2cedcc0 (patch) | |
| tree | 3ee63fecafae8bc010666ed23efc5e6467e87ce7 /test/reshape.cpp | |
| parent | a488d59787d25337fd71bcc994d1c2c6ab011731 (diff) | |
Add reshaped<>() shortcuts when returning vectors and remove the reshaping version of operator()(all)
Diffstat (limited to 'test/reshape.cpp')
| -rw-r--r-- | test/reshape.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/test/reshape.cpp b/test/reshape.cpp index da5c01183..2c241f2fe 100644 --- a/test/reshape.cpp +++ b/test/reshape.cpp @@ -149,18 +149,22 @@ void reshape4x4(MatType m) MatrixXi m28r2 = m.transpose().template reshaped<ColMajor>(8,2).transpose(); VERIFY_IS_EQUAL( m28r1, m28r2); - VERIFY(is_same_eq(m.reshaped(v16,fix<1>), m(all))); - VERIFY_IS_EQUAL(m.reshaped(16,1), m(all)); - VERIFY_IS_EQUAL(m.reshaped(1,16), m(all).transpose()); - VERIFY_IS_EQUAL(m(all).reshaped(2,8), m.reshaped(2,8)); - VERIFY_IS_EQUAL(m(all).reshaped(4,4), m.reshaped(4,4)); - VERIFY_IS_EQUAL(m(all).reshaped(8,2), m.reshaped(8,2)); - - VERIFY(is_same_eq(m.reshaped(AutoSize,fix<1>), m(all))); - VERIFY_IS_EQUAL(m.template reshaped<RowMajor>(fix<1>,AutoSize), m.transpose()(all).transpose()); + VERIFY(is_same_eq(m.reshaped(v16,fix<1>), m.reshaped())); + VERIFY_IS_EQUAL(m.reshaped(16,1), m.reshaped()); + VERIFY_IS_EQUAL(m.reshaped(1,16), m.reshaped().transpose()); + VERIFY_IS_EQUAL(m.reshaped().reshaped(2,8), m.reshaped(2,8)); + VERIFY_IS_EQUAL(m.reshaped().reshaped(4,4), m.reshaped(4,4)); + VERIFY_IS_EQUAL(m.reshaped().reshaped(8,2), m.reshaped(8,2)); + + VERIFY_IS_EQUAL(m.reshaped(), m.template reshaped<ColMajor>()); + VERIFY_IS_EQUAL(m.transpose().reshaped().transpose(), m.template reshaped<RowMajor>()); + VERIFY_IS_EQUAL(m.template reshaped<RowMajor>(fix<1>, AutoSize), m.template reshaped<RowMajor>()); + + VERIFY(is_same_eq(m.reshaped(AutoSize,fix<1>), m.reshaped())); + VERIFY_IS_EQUAL(m.template reshaped<RowMajor>(fix<1>,AutoSize), m.transpose().reshaped().transpose()); } -void test_reshape() +EIGEN_DECLARE_TEST(reshape) { typedef Matrix<int,Dynamic,Dynamic> RowMatrixXi; typedef Matrix<int,4,4> RowMatrix4i; |