Changeset 1463

Timestamp:

Sep 1, 2008, 11:34:15 PM (15 years ago)

Author:

Peter

Message:

fixing compilation errors

Location:

trunk

Files:

• test/normalization_test.cc (modified) (3 diffs)
• yat/normalization/ColumnNormalizer.h (modified) (3 diffs)

trunk/test/normalization_test.cc

@@ -24 +24 @@
 #include "Suite.h"
 
+#include "yat/normalization/Centralizer.h"
+#include "yat/normalization/ColumnNormalizer.h"
 #include "yat/normalization/QuantileNormalizer.h"
-#include "yat/normalization/Centralizer.h"
 
 #include "yat/utility/Matrix.h"
@@ -33 +34 @@
 using namespace theplu::yat;
 void test_centralizer(test::Suite&);
+void test_column_normalizer(test::Suite&);
 void test_quantile_normalize(test::Suite&);
 
@@ -61 +63 @@
 
 
+void test_column_normalize(test::Suite& suite)
+{
+  suite.err() << "Testing QuantileNormalizer\n";
+  
+  utility::Matrix m(2,2);
+  m(0,0) = 0;
+  m(0,1) = 10;
+  m(1,0) = 2;
+  m(1,1) = 4;
+  normalization::QuantileNormalizer qn;
+  qn(m, m);
+  suite.err() << "Testing m(0,0)\n";
+  suite.add(suite.equal(m(0,0), 2));
+  suite.err() << "Testing m(0,1)\n";
+  suite.add(suite.equal(m(0,1), 6));
+  suite.err() << "Testing m(1,0)\n";
+  suite.add(suite.equal(m(1,0), 6));
+  suite.err() << "Testing m(1,1)\n";
+  suite.add(suite.equal(m(1,1), 2));
+}
+
 void test_quantile_normalize(test::Suite& suite)
 {

trunk/yat/normalization/ColumnNormalizer.h

@@ -23 +23 @@
 */
 
+#include "yat/utility/matrix.h"
+
 namespace theplu {
 namespace yat {
-namespace utility {
-  class Matrix;
-}
 namespace normalization {
 
@@ -44 +43 @@
        functor used to normalize each column
     */
-    typedef T normalizer_type
+    typedef T normalizer_type;
 
     /**
@@ -73 +72 @@
   {
     for (size_t i=0; i<matrix.rows(); ++i)
-      normalizer_(result.begin_const_column(i), result.end_const_columns(i),
+      normalizer_(result.begin_column(i), result.end_column(i),
                   result.begin_column(i));