Add support for automatic-size deduction in reshaped, e.g.:

mat.reshaped(4,AutoSize); <-> mat.reshaped(4,mat.size()/4);

1 files changed, 72 insertions, 1 deletions

diff --git a/test/reshape.cpp b/test/reshape.cpp
index a38f5e098..8fe0b9348 100644
--- a/test/reshape.cpp
+++ b/test/reshape.cpp
@@ -17,10 +17,48 @@ is_same_eq(const T1& a, const T2& b)
   return (a.array() == b.array()).all();
 }
 
+template <typename MatType,typename OrderType>
+void check_auto_reshape4x4(MatType m,OrderType order)
+{
+  internal::VariableAndFixedInt<MatType::SizeAtCompileTime==Dynamic?-1: 1>  v1( 1);
+  internal::VariableAndFixedInt<MatType::SizeAtCompileTime==Dynamic?-1: 2>  v2( 2);
+  internal::VariableAndFixedInt<MatType::SizeAtCompileTime==Dynamic?-1: 4>  v4( 4);
+  internal::VariableAndFixedInt<MatType::SizeAtCompileTime==Dynamic?-1: 8>  v8( 8);
+  internal::VariableAndFixedInt<MatType::SizeAtCompileTime==Dynamic?-1:16> v16(16);
+
+  VERIFY(is_same_eq(m.reshaped( 1,       AutoSize, order), m.reshaped( 1, 16, order)));
+  VERIFY(is_same_eq(m.reshaped(AutoSize, 16,       order), m.reshaped( 1, 16, order)));
+  VERIFY(is_same_eq(m.reshaped( 2,       AutoSize, order), m.reshaped( 2,  8, order)));
+  VERIFY(is_same_eq(m.reshaped(AutoSize, 8,        order), m.reshaped( 2,  8, order)));
+  VERIFY(is_same_eq(m.reshaped( 4,       AutoSize, order), m.reshaped( 4,  4, order)));
+  VERIFY(is_same_eq(m.reshaped(AutoSize, 4,        order), m.reshaped( 4,  4, order)));
+  VERIFY(is_same_eq(m.reshaped( 8,       AutoSize, order), m.reshaped( 8,  2, order)));
+  VERIFY(is_same_eq(m.reshaped(AutoSize, 2,        order), m.reshaped( 8,  2, order)));
+  VERIFY(is_same_eq(m.reshaped(16,       AutoSize, order), m.reshaped(16,  1, order)));
+  VERIFY(is_same_eq(m.reshaped(AutoSize, 1,       order),  m.reshaped(16,  1, order)));
+
+  VERIFY(is_same_eq(m.reshaped(fix< 1>,   AutoSize, order),  m.reshaped(fix< 1>, v16,     order)));
+  VERIFY(is_same_eq(m.reshaped(AutoSize,  fix<16>,  order),  m.reshaped( v1,     fix<16>, order)));
+  VERIFY(is_same_eq(m.reshaped(fix< 2>,   AutoSize, order),  m.reshaped(fix< 2>, v8,      order)));
+  VERIFY(is_same_eq(m.reshaped(AutoSize,  fix< 8>,  order),  m.reshaped( v2,     fix< 8>, order)));
+  VERIFY(is_same_eq(m.reshaped(fix< 4>,   AutoSize, order),  m.reshaped(fix< 4>, v4,      order)));
+  VERIFY(is_same_eq(m.reshaped(AutoSize,  fix< 4>,  order),  m.reshaped( v4,     fix< 4>, order)));
+  VERIFY(is_same_eq(m.reshaped(fix< 8>,   AutoSize, order),  m.reshaped(fix< 8>, v2,      order)));
+  VERIFY(is_same_eq(m.reshaped(AutoSize,  fix< 2>,  order),  m.reshaped( v8,     fix< 2>, order)));
+  VERIFY(is_same_eq(m.reshaped(fix<16>,   AutoSize, order),  m.reshaped(fix<16>, v1,      order)));
+  VERIFY(is_same_eq(m.reshaped(AutoSize,  fix< 1>,  order),  m.reshaped(v16,     fix< 1>, order)));
+}
+
 // just test a 4x4 matrix, enumerate all combination manually
 template <typename MatType>
 void reshape4x4(MatType m)
 {
+  internal::VariableAndFixedInt<MatType::SizeAtCompileTime==Dynamic?-1: 1>  v1( 1);
+  internal::VariableAndFixedInt<MatType::SizeAtCompileTime==Dynamic?-1: 2>  v2( 2);
+  internal::VariableAndFixedInt<MatType::SizeAtCompileTime==Dynamic?-1: 4>  v4( 4);
+  internal::VariableAndFixedInt<MatType::SizeAtCompileTime==Dynamic?-1: 8>  v8( 8);
+  internal::VariableAndFixedInt<MatType::SizeAtCompileTime==Dynamic?-1:16> v16(16);
+
   if((MatType::Flags&RowMajorBit)==0)
   {
     typedef Map<MatrixXi> MapMat;
@@ -38,6 +76,7 @@ void reshape4x4(MatType m)
     VERIFY_IS_EQUAL(m.reshaped(fix< 8>, fix< 2>), MapMat(m.data(),  8,  2));
     VERIFY_IS_EQUAL(m.reshaped(fix<16>, fix< 1>), MapMat(m.data(), 16,  1));
 
+
     // reshape chain
     VERIFY_IS_EQUAL(
       (m
@@ -56,6 +95,35 @@ void reshape4x4(MatType m)
     );
   }
 
+  VERIFY(is_same_eq(m.reshaped( 1,       AutoSize), m.reshaped( 1, 16)));
+  VERIFY(is_same_eq(m.reshaped(AutoSize, 16),       m.reshaped( 1, 16)));
+  VERIFY(is_same_eq(m.reshaped( 2,       AutoSize), m.reshaped( 2,  8)));
+  VERIFY(is_same_eq(m.reshaped(AutoSize, 8),        m.reshaped( 2,  8)));
+  VERIFY(is_same_eq(m.reshaped( 4,       AutoSize), m.reshaped( 4,  4)));
+  VERIFY(is_same_eq(m.reshaped(AutoSize, 4),        m.reshaped( 4,  4)));
+  VERIFY(is_same_eq(m.reshaped( 8,       AutoSize), m.reshaped( 8,  2)));
+  VERIFY(is_same_eq(m.reshaped(AutoSize, 2),        m.reshaped( 8,  2)));
+  VERIFY(is_same_eq(m.reshaped(16,       AutoSize), m.reshaped(16,  1)));
+  VERIFY(is_same_eq(m.reshaped(AutoSize,  1),       m.reshaped(16,  1)));
+
+  VERIFY(is_same_eq(m.reshaped(fix< 1>,   AutoSize),  m.reshaped(fix< 1>, v16)));
+  VERIFY(is_same_eq(m.reshaped(AutoSize,  fix<16>),   m.reshaped( v1,     fix<16>)));
+  VERIFY(is_same_eq(m.reshaped(fix< 2>,   AutoSize),  m.reshaped(fix< 2>, v8)));
+  VERIFY(is_same_eq(m.reshaped(AutoSize,  fix< 8>),   m.reshaped( v2,     fix< 8>)));
+  VERIFY(is_same_eq(m.reshaped(fix< 4>,   AutoSize),  m.reshaped(fix< 4>, v4)));
+  VERIFY(is_same_eq(m.reshaped(AutoSize,  fix< 4>),   m.reshaped( v4,     fix< 4>)));
+  VERIFY(is_same_eq(m.reshaped(fix< 8>,   AutoSize),  m.reshaped(fix< 8>, v2)));
+  VERIFY(is_same_eq(m.reshaped(AutoSize,  fix< 2>),   m.reshaped( v8,     fix< 2>)));
+  VERIFY(is_same_eq(m.reshaped(fix<16>,   AutoSize),  m.reshaped(fix<16>, v1)));
+  VERIFY(is_same_eq(m.reshaped(AutoSize,  fix< 1>),   m.reshaped(v16,     fix< 1>)));
+
+  check_auto_reshape4x4(m,ColOrder);
+  check_auto_reshape4x4(m,RowOrder);
+  check_auto_reshape4x4(m,AutoOrder);
+  check_auto_reshape4x4(m.transpose(),ColOrder);
+  check_auto_reshape4x4(m.transpose(),RowOrder);
+  check_auto_reshape4x4(m.transpose(),AutoOrder);
+
   VERIFY_IS_EQUAL(m.reshaped( 1, 16).data(), m.data());
   VERIFY_IS_EQUAL(m.reshaped( 1, 16).innerStride(), 1);
 
@@ -82,12 +150,15 @@ void reshape4x4(MatType m)
   VERIFY_IS_EQUAL( m28r1, m28r2);
 
   using placeholders::all;
-  VERIFY(is_same_eq(m.reshaped(fix<MatType::SizeAtCompileTime>(m.size()),fix<1>), m(all)));
+  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.reshaped(fix<1>,AutoSize,RowOrder), m.transpose()(all).transpose());
 }
 
 void test_reshape()