fix Matrix::stride for vectors, add a unit test for Block::stride

and make use of it where it was relevant

1 files changed, 45 insertions, 0 deletions

diff --git a/test/submatrices.cpp b/test/submatrices.cpp
index a819cadc2..6fe86c281 100644
--- a/test/submatrices.cpp
+++ b/test/submatrices.cpp
@@ -170,6 +170,48 @@ template<typename MatrixType> void submatrices(const MatrixType& m)
   VERIFY(ei_real(ones.row(r1).dot(ones.row(r2))) == RealScalar(cols));
 }
 
+
+template<typename MatrixType>
+void compare_using_data_and_stride(const MatrixType& m)
+{
+  int rows = m.rows();
+  int cols = m.cols();
+  int size = m.size();
+  int stride = m.stride();
+  const typename MatrixType::Scalar* data = m.data();
+
+  for(int j=0;j<cols;++j)
+    for(int i=0;i<rows;++i)
+      VERIFY_IS_APPROX(m.coeff(i,j), data[(MatrixType::Flags&RowMajorBit) ? i*stride+j : j*stride + i]);
+
+  if(MatrixType::IsVectorAtCompileTime)
+  {
+    VERIFY_IS_APPROX(stride, int((&m.coeff(1))-(&m.coeff(0))));
+    for (int i=0;i<size;++i)
+      VERIFY_IS_APPROX(m.coeff(i), data[i*stride]);
+  }
+}
+
+template<typename MatrixType>
+void data_and_stride(const MatrixType& m)
+{
+  int rows = m.rows();
+  int cols = m.cols();
+
+  int r1 = ei_random<int>(0,rows-1);
+  int r2 = ei_random<int>(r1,rows-1);
+  int c1 = ei_random<int>(0,cols-1);
+  int c2 = ei_random<int>(c1,cols-1);
+
+  MatrixType m1 = MatrixType::Random(rows, cols);
+  compare_using_data_and_stride(m1.block(r1, c1, r2-r1+1, c2-c1+1));
+  compare_using_data_and_stride(m1.transpose().block(c1, r1, c2-c1+1, r2-r1+1));
+  compare_using_data_and_stride(m1.row(r1));
+  compare_using_data_and_stride(m1.col(c1));
+  compare_using_data_and_stride(m1.row(r1).transpose());
+  compare_using_data_and_stride(m1.col(c1).transpose());
+}
+
 void test_submatrices()
 {
   for(int i = 0; i < g_repeat; i++) {
@@ -179,5 +221,8 @@ void test_submatrices()
     CALL_SUBTEST( submatrices(MatrixXi(8, 12)) );
     CALL_SUBTEST( submatrices(MatrixXcd(20, 20)) );
     CALL_SUBTEST( submatrices(MatrixXf(20, 20)) );
+
+    CALL_SUBTEST( data_and_stride(MatrixXf(ei_random(5,50), ei_random(5,50))) );
+    CALL_SUBTEST( data_and_stride(Matrix<int,Dynamic,Dynamic,RowMajor>(ei_random(5,50), ei_random(5,50))) );
   }
 }