Changeset 4131

Timestamp:

Jan 21, 2022, 1:53:44 AM (20 months ago)

Author:

Peter

Message:

tests for Matrix View iterators; refs #975 and #202.

Location:

trunk/test

Files:

• Makefile.am (modified) (1 diff)
• matrix_view.cc (modified) (3 diffs)

trunk/test/Makefile.am

@@ -145 +145 @@
 
 # tests not passing through yet
-XFAIL_TESTS =
+XFAIL_TESTS = test/matrix_view.test
 
 DISTRIBUTED_TESTS = \

trunk/test/matrix_view.cc

@@ -145 +145 @@
 
 
+template<class VIEW>
+void test_iterators(test::Suite& suite, utility::Matrix m)
+{
+  suite.out () << __func__ << "\n";
+  size_t n1 = 2;
+  size_t n2 = 4;
+  VIEW view(m, 1, 3, n1, n2);
+
+  suite.test_random_access_iterator(view.begin());
+  suite.test_random_access_iterator(view.begin_row(0));
+  suite.test_random_access_iterator(view.begin_column(0));
+
+  suite.out() << "testing ::row_iterator\n";
+  size_t n = view.end_row(0) - view.begin_row(0);
+  if (n != n2) {
+    suite.add(false);
+    suite.err() << "end - begin: " << n << "; expected " << n2 << "\n";
+  }
+  if (view.begin_row(0)[1] != view(0,1)) {
+    suite.add(false);
+    suite.err() << "error: view.begin_row(0)[1]: " << view.begin_row(0)[1]
+                << "; expected: " << view(0,1) << "\n";
+  }
+
+  suite.out() << "testing ::column_iterator\n";
+  n = view.end_column(0) - view.begin_column(0);
+  if (n != n1) {
+    suite.add(false);
+    suite.err() << "end - begin: " << n << "; expected " << n1 << "\n";
+  }
+  if (view.begin_column(0)[1] != view(1,0)) {
+    suite.add(false);
+    suite.err() << "error: view.begin_column(0)[1]: " << view.begin_column(0)[1]
+                << "; expected: " << view(1,0) << "\n";
+  }
+
+  suite.out() << "testing ::iterator\n";
+  n = view.end() - view.begin();
+  if (n != n1*n2) {
+    suite.add(false);
+    suite.err() << "end - begin: " << n << "; expected " << n1*n2 << "\n";
+  }
+  if (view.begin()[n2] != view(1,0)) {
+    suite.add(false);
+    suite.err() << "error: view.begin(n2)[1]: " << view.begin()[n2]
+                << "; expected: " << view(1,0) << "\n";
+  }
+}
+
+
 void test_matrix_view(test::Suite& suite)
 {
@@ -157 +207 @@
   test_constructors<MatrixView>(suite, m);
   test_assignment<MatrixView>(suite, m);
+  test_iterators<MatrixView>(suite, m);
 }
 
@@ -170 +221 @@
       m(i,j) = 10*i + j;
   test_constructors<MatrixConstView>(suite, m);
-}
+  test_iterators<MatrixConstView>(suite, m);
+}