Changeset 533

Timestamp:

Mar 3, 2006, 11:29:56 AM (16 years ago)

Author:

Peter

Message:

test for MatrixLookup?. NOTE: consensus_inputranker_test still fails

Location:

trunk

Files:

• lib/classifier/DataLookup1D.h (modified) (1 diff)
• lib/classifier/DataLookup2D.cc (modified) (1 diff)
• lib/classifier/DataLookup2D.h (modified) (1 diff)
• lib/classifier/MatrixLookup.cc (modified) (2 diffs)
• lib/classifier/MatrixLookup.h (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/lookup_test.cc (added)

trunk/lib/classifier/DataLookup1D.h

@@ -25 +25 @@
 
     ///
-    /// Constructor 
+    /// Constructor. 
     ///
-    DataLookup1D(const DataLookup2D&, const size_t, 
+    /// @parameter row_vector if true (default) DataLookup1D is
+    /// looking into a column of DataLookup2D, otherwise looking into
+    /// a row.  @parameter index which row/column to look into.
+    ///
+    DataLookup1D(const DataLookup2D&, const size_t index, 
                  const bool row_vector=true);
 

trunk/lib/classifier/DataLookup2D.cc

@@ -7 +7 @@
 namespace theplu {
 namespace classifier {
-
-
-  DataLookup2D::DataLookup2D()
-  {
-  }
 
 

trunk/lib/classifier/DataLookup2D.h

@@ -22 +22 @@
     /// Default constructor.
     ///
-    DataLookup2D(void);
+    inline DataLookup2D(void) {};
 
 

trunk/lib/classifier/MatrixLookup.cc

@@ -26 +26 @@
 
 
-  MatrixLookup::MatrixLookup(const MatrixLookup& ml, 
-                     const std::vector<size_t>& row, 
-                     const std::vector<size_t>& col)
-    : DataLookup2D(ml,row,col), data_(ml.data_)
-  {
-  }
-  
-
-
   MatrixLookup::MatrixLookup(const gslapi::matrix& data, 
                      const std::vector<size_t>& index, 
@@ -57 +48 @@
   }
 
+
+
+  MatrixLookup::MatrixLookup(const MatrixLookup& data, 
+                             const std::vector<size_t>& row, 
+                             const std::vector<size_t>& col)
+    : DataLookup2D(data,row,col), data_(data.data_)
+  {
+  }
+  
 
 

trunk/lib/classifier/MatrixLookup.h

@@ -24 +24 @@
 
     ///
-    /// Constructor 
+    /// Constructor creating a lookup into the whole matrix. 
     ///
     explicit MatrixLookup(const gslapi::matrix&);
 
     ///
-    /// Constructor taking the row index vector and column index vector 
-    /// as input. 
+    /// Constructor creating a lookup into parts of matrix. The
+    /// \f$i\f$th row in constructed lookup is identical to row number
+    /// row[i] in matrix. The \f$i\f$th column in constructed lookup
+    /// is identical to column number column[i] in matrix.
     ///
-    MatrixLookup(const gslapi::matrix&, const std::vector<size_t>&, 
-             const std::vector<size_t>&);
+    MatrixLookup(const gslapi::matrix&, const std::vector<size_t>& row, 
+             const std::vector<size_t>& column);
 
     ///
-    /// Constructor taking the column (default) or row index vector 
-    /// as input. 
+    /// Constructor taking rows or columns 
+    ///
+    /// @parameter row_vectors if true (default) the new MatrixLookup
+    /// will look into a sub-matrix defined by all columns and rows
+    /// defined by @a index. If not true the new MatrixLookup will
+    /// look into a sub-matrix defined by all rows and columns defined
+    /// by @a index.
     ///
-    MatrixLookup(const gslapi::matrix&, const std::vector<size_t>&, 
-             bool row=false);
+    MatrixLookup(const gslapi::matrix&, const std::vector<size_t>& index, 
+                 const bool row_vectors=true);
 
     ///

trunk/test/Makefile.am

@@ -4 +4 @@
 
 TESTS = alignment_test averager_test consensus_inputranker_test \
-  crossvalidation_test ensemble_test inputranker_test kernel_test matrix_test \
+  crossvalidation_test ensemble_test inputranker_test \
+  kernel_test lookup_test matrix_test \
   ncc_test nni_test pca_test regression_test rnd_test score_test \
   statistics_test stl_utility_test svd_test svm_test target_test \
@@ -24 +25 @@
 inputranker_test_SOURCES = inputranker_test.cc
 kernel_test_SOURCES = kernel_test.cc
+lookup_test_SOURCES = lookup_test.cc
 matrix_test_SOURCES = matrix_test.cc
 ncc_test_SOURCES = ncc_test.cc