Changed the AnyMatrixBase / ei_special_scalar_op inheritance order as proposed by Gael.

Added conservativeResizeLike as discussed on the mailing list.

1 files changed, 30 insertions, 16 deletions

diff --git a/test/conservative_resize.cpp b/test/conservative_resize.cpp
index f0d025283..e4ff4f331 100644
--- a/test/conservative_resize.cpp
+++ b/test/conservative_resize.cpp
@@ -108,22 +108,36 @@ void run_vector_tests()
   }
 }
 
+template <typename Scalar, int Storage>
+void run_resize_like_tests()
+{
+  typedef Matrix<Scalar, Eigen::Dynamic, 1, Storage> MatrixType;
+
+  MatrixType m;
+
+  m = MatrixType::Random(5);
+  m.conservativeResizeLike( MatrixType::Ones(2) );
+  std::cout << m << std::endl;
+}
+
 void test_conservative_resize()
 {
-  run_matrix_tests<int, Eigen::RowMajor>();
-  run_matrix_tests<int, Eigen::ColMajor>();
-  run_matrix_tests<float, Eigen::RowMajor>();
-  run_matrix_tests<float, Eigen::ColMajor>();
-  run_matrix_tests<double, Eigen::RowMajor>();
-  run_matrix_tests<double, Eigen::ColMajor>();
-  run_matrix_tests<std::complex<float>, Eigen::RowMajor>();
-  run_matrix_tests<std::complex<float>, Eigen::ColMajor>();
-  run_matrix_tests<std::complex<double>, Eigen::RowMajor>();
-  run_matrix_tests<std::complex<double>, Eigen::ColMajor>();
-
-  run_vector_tests<int>();
-  run_vector_tests<float>();
-  run_vector_tests<double>();
-  run_vector_tests<std::complex<float> >();
-  run_vector_tests<std::complex<double> >();
+  run_resize_like_tests<int, Eigen::RowMajor>();
+
+  //run_matrix_tests<int, Eigen::RowMajor>();
+  //run_matrix_tests<int, Eigen::ColMajor>();
+  //run_matrix_tests<float, Eigen::RowMajor>();
+  //run_matrix_tests<float, Eigen::ColMajor>();
+  //run_matrix_tests<double, Eigen::RowMajor>();
+  //run_matrix_tests<double, Eigen::ColMajor>();
+  //run_matrix_tests<std::complex<float>, Eigen::RowMajor>();
+  //run_matrix_tests<std::complex<float>, Eigen::ColMajor>();
+  //run_matrix_tests<std::complex<double>, Eigen::RowMajor>();
+  //run_matrix_tests<std::complex<double>, Eigen::ColMajor>();
+
+  //run_vector_tests<int>();
+  //run_vector_tests<float>();
+  //run_vector_tests<double>();
+  //run_vector_tests<std::complex<float> >();
+  //run_vector_tests<std::complex<double> >();
 }