Cleanup intitial reshape implementation:

 - reshape -> reshaped
 - make it compatible with evaluators.

2 files changed, 23 insertions, 22 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 315b7bece..48a28b58a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -160,10 +160,10 @@ endif()
 ei_add_test(redux)
 ei_add_test(visitor)
 ei_add_test(block)
-ei_add_test(reshape)
 ei_add_test(corners)
 ei_add_test(symbolic_index)
 ei_add_test(indexed_view)
+ei_add_test(reshape)
 ei_add_test(swap)
 ei_add_test(resize)
 ei_add_test(conservative_resize)
diff --git a/test/reshape.cpp b/test/reshape.cpp
index 0298a2fe4..e2c045aa6 100644
--- a/test/reshape.cpp
+++ b/test/reshape.cpp
@@ -15,35 +15,36 @@ using Eigen::MatrixXi;
 // just test a 4x4 matrix, enumerate all combination manually,
 // so I don't have to do template-meta-programming here.
 template <typename MatType>
-void reshape_all_size(MatType m) {
+void reshape_all_size(MatType m)
+{
   typedef Eigen::Map<MatrixXi> MapMat;
   // dynamic
-  VERIFY_IS_EQUAL((m.template reshape( 1, 16)), MapMat(m.data(),  1, 16));
-  VERIFY_IS_EQUAL((m.template reshape( 2,  8)), MapMat(m.data(),  2,  8));
-  VERIFY_IS_EQUAL((m.template reshape( 4,  4)), MapMat(m.data(),  4,  4));
-  VERIFY_IS_EQUAL((m.template reshape( 8,  2)), MapMat(m.data(),  8,  2));
-  VERIFY_IS_EQUAL((m.template reshape(16,  1)), MapMat(m.data(), 16,  1));
+  VERIFY_IS_EQUAL((m.reshaped( 1, 16)), MapMat(m.data(),  1, 16));
+  VERIFY_IS_EQUAL((m.reshaped( 2,  8)), MapMat(m.data(),  2,  8));
+  VERIFY_IS_EQUAL((m.reshaped( 4,  4)), MapMat(m.data(),  4,  4));
+  VERIFY_IS_EQUAL((m.reshaped( 8,  2)), MapMat(m.data(),  8,  2));
+  VERIFY_IS_EQUAL((m.reshaped(16,  1)), MapMat(m.data(), 16,  1));
 
   // static
-  VERIFY_IS_EQUAL((m.template reshape< 1, 16>()), MapMat(m.data(),  1, 16));
-  VERIFY_IS_EQUAL((m.template reshape< 2,  8>()), MapMat(m.data(),  2,  8));
-  VERIFY_IS_EQUAL((m.template reshape< 4,  4>()), MapMat(m.data(),  4,  4));
-  VERIFY_IS_EQUAL((m.template reshape< 8,  2>()), MapMat(m.data(),  8,  2));
-  VERIFY_IS_EQUAL((m.template reshape<16,  1>()), MapMat(m.data(), 16,  1));
+  VERIFY_IS_EQUAL((m.template reshaped< 1, 16>()), MapMat(m.data(),  1, 16));
+  VERIFY_IS_EQUAL((m.template reshaped< 2,  8>()), MapMat(m.data(),  2,  8));
+  VERIFY_IS_EQUAL((m.template reshaped< 4,  4>()), MapMat(m.data(),  4,  4));
+  VERIFY_IS_EQUAL((m.template reshaped< 8,  2>()), MapMat(m.data(),  8,  2));
+  VERIFY_IS_EQUAL((m.template reshaped<16,  1>()), MapMat(m.data(), 16,  1));
 
   // reshape chain
   VERIFY_IS_EQUAL(
     (m
-     .template reshape( 1, 16)
-     .template reshape< 2,  8>()
-     .template reshape(16,  1)
-     .template reshape< 8,  2>()
-     .template reshape( 2,  8)
-     .template reshape< 1, 16>()
-     .template reshape( 4,  4)
-     .template reshape<16,  1>()
-     .template reshape( 8,  2)
-     .template reshape< 4,  4>()
+     .         reshaped( 1, 16)
+     .template reshaped< 2,  8>()
+     .         reshaped(16,  1)
+     .template reshaped< 8,  2>()
+     .         reshaped( 2,  8)
+     .template reshaped< 1, 16>()
+     .         reshaped( 4,  4)
+     .template reshaped<16,  1>()
+     .         reshaped( 8,  2)
+     .template reshaped< 4,  4>()
     ),
     MapMat(m.data(), 4,  4)
   );