harder test for SparseMatrixEZ::const_iterator

git-svn-id: https://svn.dealii.org/trunk@7673 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/lac/sparse_matrices.cc b/tests/lac/sparse_matrices.cc
index aefc04ec3156878da9bfb6bcdd739547608ae089..981fe3ff1492c7cc398374677d1383aeb8d6df63 100644 (file)
--- a/tests/lac/sparse_matrices.cc
+++ b/tests/lac/sparse_matrices.cc
@@ -97,25 +97,64 @@ template <class MATRIX>
 void
 check_iterator (const MATRIX& A)
 {
+//  deallog.push("it");
+  
+  typename MATRIX::const_iterator E = A.end();
+
+  if (A.m() < 10)
+    for (unsigned int r=0;r<A.m();++r)
+      {
+       typename MATRIX::const_iterator b = A.begin(r);
+       if (b == E)
+         deallog << "Final" << std::endl;
+       else
+         deallog << r
+                 << '\t' << b->row()
+                 << '\t' << b->index()
+                 << '\t' << b->column()
+                 << '\t' << b->value()
+                 << std::endl;
+       typename MATRIX::const_iterator e = A.end(r);
+       if (e == E)
+         deallog << "Final" << std::endl;
+       else
+         deallog << '\t' << e->row()
+                 << '\t' << e->index()
+                 << std::endl;
+       deallog << "cols:";
+       
+       for (typename MATRIX::const_iterator i=b;i!=e;++i)
+         deallog << '\t' << i->index() << ',' << i->column();
+       deallog << std::endl;
+      }
   for (typename MATRIX::const_iterator i = A.begin(); i!= A.end(); ++i)
     deallog << '\t' << i->row()
-           << '\t' << i->column()
            << '\t' << i->index()
+           << '\t' << i->column()
            << '\t' << i->value()
            << std::endl;
   deallog << "Repeat row 2" << std::endl;
   for (typename MATRIX::const_iterator i = A.begin(2); i!= A.end(2); ++i)
     deallog << '\t' << i->row()
-           << '\t' << i->column()
            << '\t' << i->index()
+           << '\t' << i->column()
            << '\t' << i->value()
            << std::endl;
+  
+//  deallog.pop();
 }
 
 
 void check_ez_iterator()
 {
   SparseMatrixEZ<float> m (6, 6, 0);
+
+  deallog << "Empty matrix" << std::endl;
+  
+  check_iterator(m);
+
+  deallog << "Irregular matrix" << std::endl;
+  
   m.set (0, 0, 1.);
   m.set (1, 0, 2.);
   m.set (2, 0, 3.);

diff --git a/tests/results/i686-pc-linux-gnu+gcc3.2/lac/sparse_matrices.output b/tests/results/i686-pc-linux-gnu+gcc3.2/lac/sparse_matrices.output
index 576169dfef8cd0dc52fad209766ef44f9fb84825..d0fcd083aa3013ed538886bcad837b336b438539 100644 (file)
--- a/tests/results/i686-pc-linux-gnu+gcc3.2/lac/sparse_matrices.output
+++ b/tests/results/i686-pc-linux-gnu+gcc3.2/lac/sparse_matrices.output
@@ -1,11 +1,50 @@
 
+DEAL::Empty matrix
+DEAL::Final
+DEAL::Final
+DEAL::cols:
+DEAL::Final
+DEAL::Final
+DEAL::cols:
+DEAL::Final
+DEAL::Final
+DEAL::cols:
+DEAL::Final
+DEAL::Final
+DEAL::cols:
+DEAL::Final
+DEAL::Final
+DEAL::cols:
+DEAL::Final
+DEAL::Final
+DEAL::cols:
+DEAL::Repeat row 2
+DEAL::Irregular matrix
+DEAL::0        0       0       0       1.0
+DEAL:: 1       0
+DEAL::cols:    0,0     1,1     2,2     3,3
+DEAL::1        1       0       0       2.0
+DEAL:: 2       0
+DEAL::cols:    0,0
+DEAL::2        2       0       0       3.0
+DEAL:: 4       0
+DEAL::cols:    0,0
+DEAL::3        4       0       3       17.
+DEAL:: 4       0
+DEAL::cols:
+DEAL::4        4       0       3       17.
+DEAL::Final
+DEAL::cols:    0,3
+DEAL::Final
+DEAL::Final
+DEAL::cols:
 DEAL:: 0       0       0       1.0
 DEAL:: 0       1       1       1.0
 DEAL:: 0       2       2       2.0
 DEAL:: 0       3       3       3.0
 DEAL:: 1       0       0       2.0
 DEAL:: 2       0       0       3.0
-DEAL:: 4       3       0       17.
+DEAL:: 4       0       3       17.
 DEAL::Repeat row 2
 DEAL:: 2       0       0       3.0
 DEAL::Structure
@@ -43,73 +82,73 @@ DEAL::GrowingVectorMemory:Overall allocated vectors: 28
 DEAL::GrowingVectorMemory:Maximum allocated vectors: 2
 DEAL:: 0       0       0       5.0
 DEAL:: 0       1       1       -2.0
-DEAL:: 0       4       2       -1.0
-DEAL:: 1       1       0       5.0
-DEAL:: 1       0       1       -1.0
+DEAL:: 0       2       4       -1.0
+DEAL:: 1       0       1       5.0
+DEAL:: 1       1       0       -1.0
 DEAL:: 1       2       2       -2.0
-DEAL:: 1       5       3       -1.0
-DEAL:: 2       2       0       5.0
+DEAL:: 1       3       5       -1.0
+DEAL:: 2       0       2       5.0
 DEAL:: 2       1       1       -1.0
-DEAL:: 2       3       2       -2.0
-DEAL:: 2       6       3       -1.0
-DEAL:: 3       3       0       5.0
-DEAL:: 3       2       1       -1.0
-DEAL:: 3       7       2       -1.0
-DEAL:: 4       4       0       5.0
-DEAL:: 4       0       1       -1.0
-DEAL:: 4       5       2       -2.0
-DEAL:: 4       8       3       -1.0
-DEAL:: 5       5       0       5.0
+DEAL:: 2       2       3       -2.0
+DEAL:: 2       3       6       -1.0
+DEAL:: 3       0       3       5.0
+DEAL:: 3       1       2       -1.0
+DEAL:: 3       2       7       -1.0
+DEAL:: 4       0       4       5.0
+DEAL:: 4       1       0       -1.0
+DEAL:: 4       2       5       -2.0
+DEAL:: 4       3       8       -1.0
+DEAL:: 5       0       5       5.0
 DEAL:: 5       1       1       -1.0
-DEAL:: 5       4       2       -1.0
-DEAL:: 5       6       3       -2.0
-DEAL:: 5       9       4       -1.0
-DEAL:: 6       6       0       5.0
-DEAL:: 6       2       1       -1.0
-DEAL:: 6       5       2       -1.0
-DEAL:: 6       7       3       -2.0
-DEAL:: 6       10      4       -1.0
-DEAL:: 7       7       0       5.0
-DEAL:: 7       3       1       -1.0
-DEAL:: 7       6       2       -1.0
-DEAL:: 7       11      3       -1.0
-DEAL:: 8       8       0       5.0
-DEAL:: 8       4       1       -1.0
-DEAL:: 8       9       2       -2.0
-DEAL:: 8       12      3       -1.0
-DEAL:: 9       9       0       5.0
-DEAL:: 9       5       1       -1.0
-DEAL:: 9       8       2       -1.0
-DEAL:: 9       10      3       -2.0
-DEAL:: 9       13      4       -1.0
-DEAL:: 10      10      0       5.0
-DEAL:: 10      6       1       -1.0
-DEAL:: 10      9       2       -1.0
-DEAL:: 10      11      3       -2.0
-DEAL:: 10      14      4       -1.0
-DEAL:: 11      11      0       5.0
-DEAL:: 11      7       1       -1.0
-DEAL:: 11      10      2       -1.0
-DEAL:: 11      15      3       -1.0
-DEAL:: 12      12      0       5.0
-DEAL:: 12      8       1       -1.0
-DEAL:: 12      13      2       -2.0
-DEAL:: 13      13      0       5.0
-DEAL:: 13      9       1       -1.0
-DEAL:: 13      12      2       -1.0
-DEAL:: 13      14      3       -2.0
-DEAL:: 14      14      0       5.0
-DEAL:: 14      10      1       -1.0
-DEAL:: 14      13      2       -1.0
-DEAL:: 14      15      3       -2.0
-DEAL:: 15      15      0       5.0
-DEAL:: 15      11      1       -1.0
-DEAL:: 15      14      2       -1.0
+DEAL:: 5       2       4       -1.0
+DEAL:: 5       3       6       -2.0
+DEAL:: 5       4       9       -1.0
+DEAL:: 6       0       6       5.0
+DEAL:: 6       1       2       -1.0
+DEAL:: 6       2       5       -1.0
+DEAL:: 6       3       7       -2.0
+DEAL:: 6       4       10      -1.0
+DEAL:: 7       0       7       5.0
+DEAL:: 7       1       3       -1.0
+DEAL:: 7       2       6       -1.0
+DEAL:: 7       3       11      -1.0
+DEAL:: 8       0       8       5.0
+DEAL:: 8       1       4       -1.0
+DEAL:: 8       2       9       -2.0
+DEAL:: 8       3       12      -1.0
+DEAL:: 9       0       9       5.0
+DEAL:: 9       1       5       -1.0
+DEAL:: 9       2       8       -1.0
+DEAL:: 9       3       10      -2.0
+DEAL:: 9       4       13      -1.0
+DEAL:: 10      0       10      5.0
+DEAL:: 10      1       6       -1.0
+DEAL:: 10      2       9       -1.0
+DEAL:: 10      3       11      -2.0
+DEAL:: 10      4       14      -1.0
+DEAL:: 11      0       11      5.0
+DEAL:: 11      1       7       -1.0
+DEAL:: 11      2       10      -1.0
+DEAL:: 11      3       15      -1.0
+DEAL:: 12      0       12      5.0
+DEAL:: 12      1       8       -1.0
+DEAL:: 12      2       13      -2.0
+DEAL:: 13      0       13      5.0
+DEAL:: 13      1       9       -1.0
+DEAL:: 13      2       12      -1.0
+DEAL:: 13      3       14      -2.0
+DEAL:: 14      0       14      5.0
+DEAL:: 14      1       10      -1.0
+DEAL:: 14      2       13      -1.0
+DEAL:: 14      3       15      -2.0
+DEAL:: 15      0       15      5.0
+DEAL:: 15      1       11      -1.0
+DEAL:: 15      2       14      -1.0
 DEAL::Repeat row 2
-DEAL:: 2       2       0       5.0
+DEAL:: 2       0       2       5.0
 DEAL:: 2       1       1       -1.0
-DEAL:: 2       3       2       -2.0
-DEAL:: 2       6       3       -1.0
+DEAL:: 2       2       3       -2.0
+DEAL:: 2       3       6       -1.0
 DEAL::Assemble
 DEAL:5-SparseMatrixEZ<double>:Richardson::Starting value 4.0
 DEAL:5-SparseMatrixEZ<double>:Richardson::Failure step 10 value 3.6
@@ -144,73 +183,73 @@ DEAL::GrowingVectorMemory:Overall allocated vectors: 28
 DEAL::GrowingVectorMemory:Maximum allocated vectors: 2
 DEAL:: 0       0       0       5.0
 DEAL:: 0       1       1       -2.0
-DEAL:: 0       4       2       -1.0
+DEAL:: 0       2       4       -1.0
 DEAL:: 1       0       0       -1.0
 DEAL:: 1       1       1       5.0
 DEAL:: 1       2       2       -2.0
-DEAL:: 1       5       3       -1.0
-DEAL:: 2       1       0       -1.0
-DEAL:: 2       2       1       5.0
-DEAL:: 2       3       2       -2.0
-DEAL:: 2       6       3       -1.0
-DEAL:: 3       2       0       -1.0
-DEAL:: 3       3       1       5.0
-DEAL:: 3       7       2       -1.0
+DEAL:: 1       3       5       -1.0
+DEAL:: 2       0       1       -1.0
+DEAL:: 2       1       2       5.0
+DEAL:: 2       2       3       -2.0
+DEAL:: 2       3       6       -1.0
+DEAL:: 3       0       2       -1.0
+DEAL:: 3       1       3       5.0
+DEAL:: 3       2       7       -1.0
 DEAL:: 4       0       0       -1.0
-DEAL:: 4       4       1       5.0
-DEAL:: 4       5       2       -2.0
-DEAL:: 4       8       3       -1.0
-DEAL:: 5       1       0       -1.0
-DEAL:: 5       4       1       -1.0
-DEAL:: 5       5       2       5.0
-DEAL:: 5       6       3       -2.0
-DEAL:: 5       9       4       -1.0
-DEAL:: 6       2       0       -1.0
-DEAL:: 6       5       1       -1.0
-DEAL:: 6       6       2       5.0
-DEAL:: 6       7       3       -2.0
-DEAL:: 6       10      4       -1.0
-DEAL:: 7       3       0       -1.0
-DEAL:: 7       6       1       -1.0
-DEAL:: 7       7       2       5.0
-DEAL:: 7       11      3       -1.0
-DEAL:: 8       4       0       -1.0
-DEAL:: 8       8       1       5.0
-DEAL:: 8       9       2       -2.0
-DEAL:: 8       12      3       -1.0
-DEAL:: 9       5       0       -1.0
-DEAL:: 9       8       1       -1.0
-DEAL:: 9       9       2       5.0
-DEAL:: 9       10      3       -2.0
-DEAL:: 9       13      4       -1.0
-DEAL:: 10      6       0       -1.0
-DEAL:: 10      9       1       -1.0
-DEAL:: 10      10      2       5.0
-DEAL:: 10      11      3       -2.0
-DEAL:: 10      14      4       -1.0
-DEAL:: 11      7       0       -1.0
-DEAL:: 11      10      1       -1.0
-DEAL:: 11      11      2       5.0
-DEAL:: 11      15      3       -1.0
-DEAL:: 12      8       0       -1.0
-DEAL:: 12      12      1       5.0
-DEAL:: 12      13      2       -2.0
-DEAL:: 13      9       0       -1.0
-DEAL:: 13      12      1       -1.0
-DEAL:: 13      13      2       5.0
-DEAL:: 13      14      3       -2.0
-DEAL:: 14      10      0       -1.0
-DEAL:: 14      13      1       -1.0
-DEAL:: 14      14      2       5.0
-DEAL:: 14      15      3       -2.0
-DEAL:: 15      11      0       -1.0
-DEAL:: 15      14      1       -1.0
-DEAL:: 15      15      2       5.0
+DEAL:: 4       1       4       5.0
+DEAL:: 4       2       5       -2.0
+DEAL:: 4       3       8       -1.0
+DEAL:: 5       0       1       -1.0
+DEAL:: 5       1       4       -1.0
+DEAL:: 5       2       5       5.0
+DEAL:: 5       3       6       -2.0
+DEAL:: 5       4       9       -1.0
+DEAL:: 6       0       2       -1.0
+DEAL:: 6       1       5       -1.0
+DEAL:: 6       2       6       5.0
+DEAL:: 6       3       7       -2.0
+DEAL:: 6       4       10      -1.0
+DEAL:: 7       0       3       -1.0
+DEAL:: 7       1       6       -1.0
+DEAL:: 7       2       7       5.0
+DEAL:: 7       3       11      -1.0
+DEAL:: 8       0       4       -1.0
+DEAL:: 8       1       8       5.0
+DEAL:: 8       2       9       -2.0
+DEAL:: 8       3       12      -1.0
+DEAL:: 9       0       5       -1.0
+DEAL:: 9       1       8       -1.0
+DEAL:: 9       2       9       5.0
+DEAL:: 9       3       10      -2.0
+DEAL:: 9       4       13      -1.0
+DEAL:: 10      0       6       -1.0
+DEAL:: 10      1       9       -1.0
+DEAL:: 10      2       10      5.0
+DEAL:: 10      3       11      -2.0
+DEAL:: 10      4       14      -1.0
+DEAL:: 11      0       7       -1.0
+DEAL:: 11      1       10      -1.0
+DEAL:: 11      2       11      5.0
+DEAL:: 11      3       15      -1.0
+DEAL:: 12      0       8       -1.0
+DEAL:: 12      1       12      5.0
+DEAL:: 12      2       13      -2.0
+DEAL:: 13      0       9       -1.0
+DEAL:: 13      1       12      -1.0
+DEAL:: 13      2       13      5.0
+DEAL:: 13      3       14      -2.0
+DEAL:: 14      0       10      -1.0
+DEAL:: 14      1       13      -1.0
+DEAL:: 14      2       14      5.0
+DEAL:: 14      3       15      -2.0
+DEAL:: 15      0       11      -1.0
+DEAL:: 15      1       14      -1.0
+DEAL:: 15      2       15      5.0
 DEAL::Repeat row 2
-DEAL:: 2       1       0       -1.0
-DEAL:: 2       2       1       5.0
-DEAL:: 2       3       2       -2.0
-DEAL:: 2       6       3       -1.0
+DEAL:: 2       0       1       -1.0
+DEAL:: 2       1       2       5.0
+DEAL:: 2       2       3       -2.0
+DEAL:: 2       3       6       -1.0
 DEAL::SparseMatrixEZ:used      entries:64
 DEAL::SparseMatrixEZ:allocated entries:72
 DEAL::SparseMatrixEZ:reserved  entries:96