Changeset 417

Timestamp:

Dec 1, 2005, 11:20:31 PM (18 years ago)

Author:

Jari Häkkinen

Message:

Fixed delete bug in matrix dextructor, added more matrix tests.

Location:

branches/better_matrix_class

Files:

• lib/gslapi/matrix.cc (modified) (1 diff)
• test/matrix_test.cc (modified) (4 diffs)

branches/better_matrix_class/lib/gslapi/matrix.cc

@@ -75 +75 @@
     if (view_)
       delete view_;
-    if (m_) {
+    else if (m_)
       gsl_matrix_free(m_);
-      m_=NULL;
-    }
+    m_=NULL;
   }
 

branches/better_matrix_class/test/matrix_test.cc

@@ -3 +3 @@
 #include <c++_tools/gslapi/matrix.h>
 
+#include <unistd.h>
 #include <fstream>
 #include <iostream>
 
 int main(const int argc,const char* argv[])
-{  
+{
   using namespace theplu;
   std::ostream* error;
@@ -17 +18 @@
       std::cout << "matrix_test -v : for printing extra information\n";
   }
-  *error << "testing matrix" << std::endl;
+  *error << "Testing matrix class" << std::endl;
   bool ok = true;
 
+  *error << "\tcopy constructor and operator!=" << std::endl;
   gslapi::matrix m(3,3,9);
   gslapi::matrix m2(m);
   if (m2!=m)
     ok=false;
+
+  *error << "\toutput operator and istream constructor" << std::endl;
   std::ofstream my_out("data/tmp_test_matrix.txt");
   my_out << m2;
   my_out.close();
-
   std::ifstream is("data/tmp_test_matrix.txt");
   gslapi::matrix m3(is);
@@ -33 +36 @@
   if (m3!=m2)
     ok=false;
+  unlink("data/tmp_test_matrix.txt");
 
+  *error << "\toperator*(double)" << std::endl;
   gslapi::matrix m4(3,3,1);
   m4 *= 9;
-  
-  if (m4!=m){
+  if (m4!=m) {
     ok=false;
     *error << "error operator*=(double)" << std::endl;
   }
 
+  *error << "\tsub-matrix" << std::endl;
+  is.open("data/knni_matrix.data");
+  gslapi::matrix m5(is);
+  is.close();
+  double m5_sum=0;
+  for (size_t i=0; i<m5.rows(); ++i)
+    for (size_t j=0; j<m5.columns(); ++j)
+      m5_sum+=m5(i,j);
+  gslapi::matrix* m5sub=new gslapi::matrix(m5,3,3,3,3);
+  double m5sub_sum=0;
+  for (size_t i=0; i<m5sub->rows(); ++i)
+    for (size_t j=0; j<m5sub->columns(); ++j) {
+      m5sub_sum+=(*m5sub)(i,j);
+      (*m5sub)(i,j)=1;
+    }
+  delete m5sub;
+  double m5_sum2=0;
+  for (size_t i=0; i<m5.rows(); ++i)
+    for (size_t j=0; j<m5.columns(); ++j)
+      m5_sum2+=m5(i,j);
+  if (m5_sum2-m5_sum-9+m5sub_sum>1e-13) {
+    ok=false;
+    *error << "error sub-matrix test" << std::endl;
+  }
+
+  *error << "\tsub-(row)vector" << std::endl;
+  gslapi::vector v5subrow(m5,3);
+  double v5subrow_sum=0;
+  for (size_t i=0; i<v5subrow.size(); ++i) {
+    v5subrow_sum+=v5subrow(i);
+    v5subrow[i]=0;
+  }
+  double m5_sum3=0;
+  for (size_t i=0; i<m5.rows(); ++i)
+    for (size_t j=0; j<m5.columns(); ++j)
+      m5_sum3+=m5(i,j);
+  if (m5_sum3-m5_sum2+v5subrow_sum>1e-13) {
+    ok=false;
+    *error << "error sub-vector test 1" << std::endl;
+  }
+
+  *error << "\tsub-(column)vector" << std::endl;
+  gslapi::vector v5subcolumn(m5,0,false);
+  double v5subcolumn_sum=0;
+  for (size_t i=0; i<v5subcolumn.size(); ++i) {
+    v5subcolumn_sum+=v5subcolumn(i);
+    v5subcolumn(i)=1;
+  }
+  double m5_sum4=0;
+  for (size_t i=0; i<m5.rows(); ++i)
+    for (size_t j=0; j<m5.columns(); ++j)
+      m5_sum4+=m5(i,j);
+  if (m5_sum4-m5_sum3-v5subcolumn.size()+v5subcolumn_sum>1e-13) {
+    ok=false;
+    *error << "error sub-vector test 2" << std::endl;
+  }
+  double v5subrow_sum2=0;
+  for (size_t i=0; i<v5subrow.size(); ++i)
+    v5subrow_sum2+=v5subrow(i);
+  if (v5subrow_sum2-v5subcolumn(3)>1e-13) {
+    ok=false;
+    *error << "error sub-vector test 3" << std::endl;
+  }
+
+  *error << "\tsub-vector and vector copying" << std::endl;
+  gslapi::vector v6(v5subrow);
+  v6.set_all(2);
+  double v5subrow_sum3=0;
+  for (size_t i=0; i<v5subrow.size(); ++i)
+    v5subrow_sum3+=v5subrow(i);
+  if (v5subrow_sum3-v5subrow_sum2>1e-13) {
+    ok=false;
+    *error << "error sub-vector test 4" << std::endl;
+  }
+  v5subrow.set(v6);
+  double m5_sum5=0;
+  for (size_t i=0; i<m5.rows(); ++i)
+    for (size_t j=0; j<m5.columns(); ++j)
+      m5_sum5+=m5(i,j);
+  if (m5_sum5-m5_sum4-v5subrow.size()*2+v5subrow_sum3>1e-13) {
+    ok=false;
+    *error << "error sub-vector test 5" << std::endl;
+  }
+  v5subrow=gslapi::vector(23,22);
+  double m5_sum6=0;
+  for (size_t i=0; i<m5.rows(); ++i)
+    for (size_t j=0; j<m5.columns(); ++j)
+      m5_sum6+=m5(i,j);
+  if (m5_sum6-m5_sum5>1e-13) {
+    ok=false;
+    *error << "error sub-vector test 6" << std::endl;
+  }
 
   if (error!=&std::cerr)
@@ -47 +143 @@
 
   return (ok ? 0 : -1);
-
 }