Changeset 419 for branches

Timestamp:

Dec 2, 2005, 12:52:49 AM (18 years ago)

Author:

Jari Häkkinen

Message:

Added more matrix tests.

File:

• branches/better_matrix_class/test/matrix_test.cc (modified) (11 diffs)

branches/better_matrix_class/test/matrix_test.cc

@@ -6 +6 @@
 #include <fstream>
 #include <iostream>
+
+class matrixwrapper
+{
+public:
+  matrixwrapper(size_t i,size_t j,double value=7)
+    : m_(i,j,value) {}
+
+  inline theplu::gslapi::vector
+  row(const size_t& i) { return theplu::gslapi::vector(m_,i); }
+
+  inline const theplu::gslapi::matrix& matrix(void) const { return m_; }
+
+private:
+  theplu::gslapi::matrix m_;
+};
+
 
 int main(const int argc,const char* argv[])
@@ -18 +34 @@
       std::cout << "matrix_test -v : for printing extra information\n";
   }
+
   *error << "Testing matrix class" << std::endl;
   bool ok = true;
@@ -28 +45 @@
 
   *error << "\toutput operator and istream constructor" << std::endl;
+  // Checking that the matrix output operator writes a file that the
+  // input operator can read.
   std::ofstream my_out("data/tmp_test_matrix.txt");
   my_out << m2;
@@ -47 +66 @@
 
   *error << "\tsub-matrix" << std::endl;
+  // Checking that sub-matrices work, i.e. mutation to the view are
+  // reflected in the viewed object.
   is.open("data/knni_matrix.data");
+  // The stream input is a proper matrix file, with some stray empty
+  // lines and other whitespaces. The file is not expected to break
+  // things.
   gslapi::matrix m5(is);
   is.close();
@@ -72 +96 @@
 
   *error << "\tsub-(row)vector" << std::endl;
+  // Checking that the row view works, i.e. mutation to the view are
+  // reflected in the viewed object.
   gslapi::vector v5subrow(m5,3);
   double v5subrow_sum=0;
@@ -88 +114 @@
 
   *error << "\tsub-(column)vector" << std::endl;
+  // Checking that the column view works, i.e. mutation to the view
+  // are reflected in the viewed object.
   gslapi::vector v5subcolumn(m5,0,false);
   double v5subcolumn_sum=0;
@@ -102 +130 @@
     *error << "error sub-vector test 2" << std::endl;
   }
+  // Checking that the column view above mutates the values in the row
+  // view.
   double v5subrow_sum2=0;
   for (size_t i=0; i<v5subrow.size(); ++i)
@@ -111 +141 @@
 
   *error << "\tsub-vector and vector copying" << std::endl;
+  // Checking that a view is not inherited through the copy
+  // contructor.
   gslapi::vector v6(v5subrow);
   v6.set_all(2);
@@ -120 +152 @@
     *error << "error sub-vector test 4" << std::endl;
   }
+  // Checking that values in a vector is copied into a viewed matrix.
   v5subrow.set(v6);
   double m5_sum5=0;
@@ -129 +162 @@
     *error << "error sub-vector test 5" << std::endl;
   }
+  // Checking that vector::operator= indeed makes a view to become a
+  // "normal" vector.
   v5subrow=gslapi::vector(23,22);
   double m5_sum6=0;
@@ -139 +174 @@
   }
 
+  // Checking that the memberfunction matrixwrapper::row() returns a
+  // view
+  *error << "\tthat class member returns a view" << std::endl;
+  matrixwrapper mw(5,2);
+  gslapi::vector mwrow=mw.row(2);
+  if (mwrow.gsl_vector_p()->data != &(mw.matrix()(2,0))) {
+    ok=false;
+    *error << "error sub-vector test 7" << std::endl;
+  }
+
+  *error << "\tsub-matrix of a sub-matrix" << std::endl;
+  // Checking that a sub-matrix of a sub-matrix can be created.
+  gslapi::matrix sub(m5,3,3,3,3);
+  gslapi::matrix subsub(sub,2,1,1,2);
+  subsub(0,0)=23221121;
+  if (&sub(2,1)!=&subsub(0,0) || subsub(0,0)!=m5(5,4) || &subsub(0,0)!=&m5(5,4)){
+    ok=false;
+    *error << "error sub-matrix test 1" << std::endl;
+  }
+
   if (error!=&std::cerr)
     delete error;