Changeset 1520

Timestamp:

Sep 21, 2008, 6:53:12 AM (15 years ago)

Author:

Peter

Message:

adding a RowNormalizer?

Location:

trunk

Files:

• test/normalization_test.cc (modified) (4 diffs)
• yat/normalizer/Makefile.am (modified) (1 diff)
• yat/normalizer/RowNormalizer.h (copied) (copied from trunk/yat/normalizer/ColumnNormalizer.h) (4 diffs)

trunk/test/normalization_test.cc

@@ -26 +26 @@
 #include "yat/utility/DataIterator.h"
 #include "yat/normalizer/QuantileNormalizer.h"
+#include "yat/normalizer/RowNormalizer.h"
 #include "yat/normalizer/Spearman.h"
 
@@ -40 +41 @@
 void test_column_normalize(test::Suite&);
 void test_quantile_normalize(test::Suite&);
+void test_row_normalize(test::Suite&);
 void test_spearman(test::Suite&);
 void test_spearman_weighted(test::Suite&);
@@ -51 +53 @@
   test_column_normalize(suite);
   test_quantile_normalize(suite);
+  test_row_normalize(suite);
   test_spearman(suite);
 
@@ -112 +115 @@
   suite.err() << "Testing m(1,1)\n";
   suite.add(suite.equal(m(1,1), 2));
+}
+
+void test_row_normalize(test::Suite& suite)
+{
+  using namespace normalizer;
+  suite.err() << "Testing RowNormalizer\n";
+  
+  utility::Matrix m(2,3);
+  m(0,0) = 0;
+  m(0,1) = 10;
+  m(1,0) = 2;
+  m(1,1) = 4;
+  utility::Matrix m2(m);
+  m2.transpose();
+  ColumnNormalizer<Centralizer<> > cn;
+  RowNormalizer<Centralizer<> > rn;
+  cn(m, m);
+  rn(m2, m2);
+  m2.transpose();
+  suite.equal_range(m.begin(), m.end(), m2.begin());
 }
 

trunk/yat/normalizer/Makefile.am

@@ -26 +26 @@
 
 include_normalizer_HEADERS = Centralizer.h ColumnNormalizer.h \
-  QuantileNormalizer.h Spearman.h
+  QuantileNormalizer.h RowNormalizer.h Spearman.h

trunk/yat/normalizer/RowNormalizer.h

@@ -1 @@
-#ifndef _theplu_yat_normalizer_column_normalizer_
-#define _theplu_yat_normalizer_column_normalizer_
+#ifndef _theplu_yat_normalizer_row_normalizer_
+#define _theplu_yat_normalizer_rows_normalizer_
 
 /*
@@ -31 +31 @@
 
   /**
-     \brief Normalize each column
+     \brief Normalize each row
 
-     Using a functor T to normalize each column.
+     Using a functor T to normalize each row.
 
      \since New in yat 0.5
    */
   template<class T>
-  class ColumnNormalizer
+  class RowNormalizer
   {
   public:
@@ -49 +49 @@
        \brief Default constructor
      */
-    ColumnNormalizer(void) {}
+    RowNormalizer(void) {}
 
     /**
        \brief Constructor taking a functor \a norm
      */
-    ColumnNormalizer(T norm) 
+    RowNormalizer(T norm) 
       : normalizer_(norm) {}
 
     /**
-       Each column in \a matrix is normalized using class T, and
+       Each row in \a matrix is normalized using class T, and
        assigned to Matrix \a result.
 
@@ -70 +70 @@
 
   template<class T>
-  void ColumnNormalizer<T>::operator()(const utility::Matrix& matrix, 
-                                       utility::Matrix& result) const
+  void RowNormalizer<T>::operator()(const utility::Matrix& matrix, 
+                                    utility::Matrix& result) const
   {
     using utility::yat_assert;
     yat_assert<std::runtime_error>(matrix.rows()==result.rows(),
-                                   "ColumnNormalizer: rows mismatch");
+                                   "RowNormalizer: rows mismatch");
     yat_assert<std::runtime_error>(matrix.columns()==result.columns(),
-                                   "ColumnNormalizer: columns mismatch");
-    for (size_t i=0; i<matrix.columns(); ++i)
-      normalizer_(matrix.begin_column(i), matrix.end_column(i),
-                  result.begin_column(i));
+                                   "RowNormalizer: columns mismatch");
+    for (size_t i=0; i<matrix.rows(); ++i)
+      normalizer_(matrix.begin_row(i), matrix.end_row(i),
+                  result.begin_row(i));
 
   }