Changeset 534

Timestamp:

Mar 3, 2006, 12:27:58 PM (16 years ago)

Author:

Peter

Message:

bug fixes in MatrixLookup? and extended test

Location:

trunk

Files:

• lib/classifier/DataLookup2D.cc (modified) (1 diff)
• lib/classifier/DataLookup2D.h (modified) (1 diff)
• lib/classifier/MatrixLookup.cc (modified) (4 diffs)
• lib/classifier/MatrixLookup.h (modified) (1 diff)
• test/lookup_test.cc (modified) (2 diffs)

trunk/lib/classifier/DataLookup2D.cc

@@ -54 +54 @@
 
 
-  DataLookup2D::DataLookup2D(const std::vector<size_t>& index, bool row)
-  {
-  }
-
-  
   DataLookup2D::DataLookup2D(const DataLookup2D& mv)
     : row_index_(mv.row_index_),column_index_(mv.column_index_)

trunk/lib/classifier/DataLookup2D.h

@@ -30 +30 @@
     ///
     DataLookup2D(const std::vector<size_t>&, const std::vector<size_t>&);
-
-    ///
-    /// Constructor taking the row index vector or 
-    /// column index vector (default) 
-    ///
-    DataLookup2D(const std::vector<size_t>&, bool row=false);
-
 
     ///

trunk/lib/classifier/MatrixLookup.cc

@@ -29 +29 @@
                      const std::vector<size_t>& index, 
                      const bool row)
-    : DataLookup2D(index, row), data_(&data)
+    : DataLookup2D(), data_(&data)
   {
-  }
-  
-
-
-  MatrixLookup::MatrixLookup(const MatrixLookup& ml, 
-                     const std::vector<size_t>& index, bool row)
-    : DataLookup2D(ml,index,row), data_(ml.data_)
-  {
+    if (row){
+      row_index_=index;
+      assert(column_index_.empty());
+      column_index_.reserve(data.columns());
+      for (size_t i=0; i<data.columns(); i++)
+        column_index_.push_back(i);
+    }
+    else{
+      column_index_=index;
+      assert(row_index_.empty());
+      column_index_.reserve(data.rows());
+      for (size_t i=0; i<data.rows(); i++)
+        row_index_.push_back(i);
+    }
   }
   
@@ -50 +56 @@
 
 
-  MatrixLookup::MatrixLookup(const MatrixLookup& data, 
+  MatrixLookup::MatrixLookup(const MatrixLookup& ml, 
                              const std::vector<size_t>& row, 
                              const std::vector<size_t>& col)
-    : DataLookup2D(data,row,col), data_(data.data_)
+    : DataLookup2D(ml,row,col), data_(ml.data_)
+  {
+  }
+  
+
+
+  MatrixLookup::MatrixLookup(const MatrixLookup& ml, 
+                             const std::vector<size_t>& index, bool row)
+    : DataLookup2D(ml,index,row), data_(ml.data_)
   {
   }
@@ -62 +76 @@
   MatrixLookup::training_data(const std::vector<size_t>& i) const
   { 
-    return new MatrixLookup(*this,i); 
+    return new MatrixLookup(*this,i, false); 
   }
 
@@ -71 +85 @@
                                 const std::vector<size_t>& val) const
   { 
-    return new MatrixLookup(*this,val); 
+    return new MatrixLookup(*this,val, false); 
   }
 

trunk/lib/classifier/MatrixLookup.h

@@ -50 +50 @@
 
     ///
-    /// Copy constructor.
+    /// @brief Copy constructor.
     ///
     MatrixLookup(const MatrixLookup&);

trunk/test/lookup_test.cc

@@ -86 +86 @@
 
   std::vector<size_t> one(1,1);
-  classifier::MatrixLookup m3(m2,one,true);
-  if (m3.rows()!=1 || m3.columns()!=m2.columns() || m3(0,0)!=m2(1,0) || 
-      m3(0,1)!=m2(1,1)) {
+  classifier::MatrixLookup m3(gsl_m2,one,true);
+  if (m3.rows()!=1 || m3.columns()!=gsl_m2.columns() || m3(0,0)!=gsl_m2(1,0) || 
+      m3(0,1)!=gsl_m2(1,1) || m3(0,2)!=gsl_m2(1,2) || m3(0,3)!=gsl_m2(1,3)) {
     ok =false;
     *error <<   "ERROR:\n" 
-           << "MatrixLookup::MatrixLookup(const MatrixLookup&,\n" 
+           << "MatrixLookup::MatrixLookup(const gslapi::matrix&,\n" 
            << "                           const std::vector<size_t>&,\n"
            << "                           const bool)"
            << std::endl;
+    *error << "m3.rows(): " << m3.rows() << " expected 1" << std::endl; 
+    *error << "m3.columns(): " << m3.columns() << " expected " 
+           << gsl_m2.columns() << std::endl; 
   }
 
@@ -118 +121 @@
   }
   
+  classifier::MatrixLookup m6(m2,one,true);
+  if (m6.rows()!=1 || m6.columns()!=m2.columns() || m6(0,0)!=m2(1,0) || 
+      m6(0,1)!=m2(1,1)) {
+    ok =false;
+    *error <<   "ERROR:\n" 
+           << "MatrixLookup::MatrixLookup(const MatrixLookup&,\n" 
+           << "                           const std::vector<size_t>&,\n"
+           << "                           const bool)"
+           << std::endl;
+  }
+
+
+  const classifier::MatrixLookup* TrnData = m2.training_data(one);
+  if (TrnData->rows() != m2.rows() || TrnData->columns()!=one.size()){
+    ok =false;
+    *error << "ERROR:\nMatrixLookup::training_data(const std::vector<size_t>)"
+           << std::endl;
+  }
+  delete TrnData;
+
+  std::vector<size_t> val(23,2);
+  const classifier::MatrixLookup* ValData = m2.validation_data(one, val);
+  if (ValData->rows() != m2.rows() || TrnData->columns()!=val.size()){
+    ok =false;
+    *error << "ERROR:\n" 
+           << "MatrixLookup::validation_data(const std::vector<size_t>,\n"
+           << "                              const std::vector<size_t>)"
+           << std::endl;
+  }
+  delete ValData;