add reshape test for const and static-size matrix

1 files changed, 36 insertions, 25 deletions

diff --git a/test/reshape.cpp b/test/reshape.cpp
index 87ffc835b..2aef066aa 100644
--- a/test/reshape.cpp
+++ b/test/reshape.cpp
@@ -12,14 +12,8 @@
 using Eigen::Map;
 using Eigen::MatrixXi;
 
-void dynamic_reshape_all_size(int row, int col) {
-  // create matrix(row, col) and filled with 0, 1, 2, ...
-  Eigen::MatrixXi m(row, col);
-  for(int r = 0; r < row; ++r)
-    for(int c = 0; c < col; ++c)
-      m(r, c) = col * c + r;
-
-  // for all possible shape
+template <typename MatType>
+void dynamic_reshape_all_size(MatType m, int row, int col) {
   for(int new_r = 1; new_r <= row * col; ++new_r) {
     // skip invalid shape
     if(row * col % new_r != 0)
@@ -34,25 +28,42 @@ void dynamic_reshape_all_size(int row, int col) {
 
 // just test a 4x4 matrix, enumerate all combination manually,
 // so I don't have to do template-meta-programming here.
-void static_reshape_all_size() {
-  // create matrix(row, col) and filled with 0, 1, 2, ...
-  int row = 4;
-  int col = 4;
-  Eigen::MatrixXi m(row, col);
-  for(int r = 0; r < row; ++r)
-    for(int c = 0; c < col; ++c)
-      m(r, c) = col * c + r;
-
-  // reshape and compare
-  VERIFY_IS_EQUAL((m.reshape< 1, 16>()), Map<MatrixXi>(m.data(),  1, 16));
-  VERIFY_IS_EQUAL((m.reshape< 2,  8>()), Map<MatrixXi>(m.data(),  2,  8));
-  VERIFY_IS_EQUAL((m.reshape< 4,  4>()), Map<MatrixXi>(m.data(),  4,  4));
-  VERIFY_IS_EQUAL((m.reshape< 8,  2>()), Map<MatrixXi>(m.data(),  8,  2));
-  VERIFY_IS_EQUAL((m.reshape<16,  1>()), Map<MatrixXi>(m.data(), 16,  1));
+template <typename MatType>
+void static_reshape_all_size(MatType m) {
+  VERIFY_IS_EQUAL((m.template reshape< 1, 16>()), Map<MatrixXi>(m.data(),  1, 16));
+  VERIFY_IS_EQUAL((m.template reshape< 2,  8>()), Map<MatrixXi>(m.data(),  2,  8));
+  VERIFY_IS_EQUAL((m.template reshape< 4,  4>()), Map<MatrixXi>(m.data(),  4,  4));
+  VERIFY_IS_EQUAL((m.template reshape< 8,  2>()), Map<MatrixXi>(m.data(),  8,  2));
+  VERIFY_IS_EQUAL((m.template reshape<16,  1>()), Map<MatrixXi>(m.data(), 16,  1));
 }
 
 void test_reshape()
 {
-  CALL_SUBTEST(dynamic_reshape_all_size(4, 4));
-  CALL_SUBTEST(static_reshape_all_size());
+  // create matrix(row, col) and filled with 0, 1, 2, ...
+  // for all possible shape
+  int row = 4;
+  int col = 4;
+  Eigen::MatrixXi mx(row, col);
+  Eigen::Matrix4i m4(row, col);
+
+  for(int r = 0; r < row; ++r) {
+    for(int c = 0; c < col; ++c) {
+      mx(r, c) = col * c + r;
+      m4(r, c) = col * c + r;
+    }
+  }
+
+  // test dynamic-size matrix
+  CALL_SUBTEST(dynamic_reshape_all_size(mx, 4, 4));
+  CALL_SUBTEST(static_reshape_all_size(mx));
+  // test static-size matrix
+  CALL_SUBTEST(dynamic_reshape_all_size(m4, 4, 4));
+  CALL_SUBTEST(static_reshape_all_size(m4));
+
+  // test dynamic-size const matrix
+  CALL_SUBTEST(dynamic_reshape_all_size(static_cast<const Eigen::MatrixXi>(mx), 4, 4));
+  CALL_SUBTEST(static_reshape_all_size(static_cast<const Eigen::MatrixXi>(mx)));
+  // test static-size const matrix
+  CALL_SUBTEST(dynamic_reshape_all_size(static_cast<const Eigen::Matrix4i>(m4), 4, 4));
+  CALL_SUBTEST(static_reshape_all_size(static_cast<const Eigen::Matrix4i>(m4)));
 }