Changeset 1447 for trunk

Timestamp:

Aug 28, 2008, 4:56:42 AM (14 years ago)

Author:

Peter

Message:

Changed the interface of QuantileNormalizer?. The interface now has one matrix& and one const&. The former is object for normalization, and the latter is the base for calculating the distributions (Quantiles). The reason to change the interface is to allow normalization based on a nother matrix, e.g., normalizing a test data matrix based on the training data matrix. Also it is more inline with the Centralizer added earlier today. refs #425

Location:

trunk

Files:

• test/Makefile.am (modified) (1 diff)
• test/normalization_test.cc (modified) (1 diff)
• yat/normalization/QuantileNormalizer.cc (modified) (2 diffs)
• yat/normalization/QuantileNormalizer.h (modified) (1 diff)

trunk/test/Makefile.am

@@ -84 +84 @@
 ncc_test_SOURCES = ncc_test.cc
 nni_test_SOURCES = nni_test.cc
+normalization_test_SOURCES = normalization_test.cc
 pca_test_SOURCES = pca_test.cc
 range_test_SOURCES = range_test.cc

trunk/test/normalization_test.cc

@@ -71 +71 @@
   m(1,1) = 4;
   normalization::QuantileNormalizer qn;
-  qn(m);
+  qn(m, m);
   suite.err() << "Testing m(0,0)\n";
   suite.add(suite.equal(m(0,0), 2));

trunk/yat/normalization/QuantileNormalizer.cc

@@ -35 +35 @@
 namespace normalization {
 
-  void QuantileNormalizer::operator()(utility::Matrix& data) const
+  void QuantileNormalizer::operator()(const utility::Matrix& data,
+                                      utility::Matrix& result) const
   {
     utility::Matrix data_copy(data);
@@ -50 +51 @@
     }
 
-    for (size_t column=0; column<data.columns(); ++column){
+    for (size_t column=0; column<result.columns(); ++column){
       std::vector<size_t> index;
-      utility::sort_index(index, data.column_const_view(column));
+      utility::sort_index(index, result.column_const_view(column));
                                
-      for (size_t row=0; row<data.rows(); ++row)
-        data(index[row], column) = averager[row].mean();
+      for (size_t row=0; row<result.rows(); ++row)
+        result(index[row], column) = averager[row].mean();
     }
   }

trunk/yat/normalization/QuantileNormalizer.h

@@ -45 +45 @@
        within a column is preserved in the normalization.
      */
-    void operator()(utility::Matrix& matrix) const;
+    void operator()(const utility::Matrix& matrix, 
+                    utility::Matrix& result) const;
   };