Changeset 1137

Timestamp:

Feb 24, 2008, 1:51:58 AM (16 years ago)

Author:

Peter

Message:

refs #327 for utility::matrix

File:

• trunk/test/view_test.cc (modified) (3 diffs)

trunk/test/view_test.cc

@@ -51 +51 @@
     data1(i,0)=7+i;
   }
+  
 
   Matrix data2(3,1,1.0);
@@ -56 +57 @@
   VectorConstView a=data1.column_const_view(0);
   VectorView b=data2.column_view(0);
+  VectorView bajs(data2, 0, false);
+  if (a(0)!=data1(0,0)){
+    *message << "Matrix::column_const_view failed\n";
+    ok =false;
+  }
+  if (b(0)!=data2(0,0)){
+    *message << "Matrix::column_view failed\n";
+    ok =false;
+  }
 
   data1.column_const_view(0);
@@ -64 +74 @@
   if ( !(b(0)==1 && b(1)==(1) && b(2)==1) )
     ok = false;
+
+  if (a.begin()!=data1.begin_column(0)){
+    ok=false;
+    *message << "VectorConstView::begin should equal " 
+             << "Matrix::begin_column(size_t)\n";
+  }
+  if (a.end()!=data1.end_column(0)) {
+    ok=false;
+    *message << "VectorConstView::end should equal " 
+             << "Matrix::end_column(size_t)\n";
+  }
+  if (b.begin()!=data2.begin_column(0)){
+    ok=false;
+    *message << "VectorView::begin " 
+             << b.begin().base() << " should equal\n"
+             << "Matrix::begin_column(size_t) "
+             << data1.begin_column(0).base() << std::endl;
+  }
+  if (b.end()!=data2.end_column(0)){
+    ok=false;
+    *message << "VectorView::end should equal " 
+             << "Matrix::end_column(size_t)\n";
+  }
+  VectorConstView c=data1.row_const_view(0);
+  VectorView d=data2.row_view(0);
+  if (c.begin()!=data1.begin_row(0)) {
+    ok=false;
+    *message << "VectorConstView::begin should equal " 
+             << "Matrix::begin_row(size_t)\n";
+  }
+  if (c.end()!=data1.end_row(0)){
+    ok=false;
+    *message << "VectorConstView::end should equal " 
+             << "Matrix::end_row(size_t)\n";
+  }
+  if (d.begin()!=data2.begin_row(0)){
+    ok=false;
+    *message << "VectorView::begin should equal " 
+             << "Matrix::begin_row(size_t)\n";
+  }
+  if (d.end()!=data2.end_row(0)){
+    ok=false;
+    *message << "VectorView::end should equal " 
+             << "Matrix::end_row(size_t)\n";
+  }
+
 
   // test that VectorConstView created from VectorView is independent