Changeset 1496

Timestamp:

Sep 12, 2008, 5:44:31 PM (13 years ago)

Author:

Peter

Message:

unweighted version of the Spearman Normalization. refs #437.

Location:

trunk

Files:

• test/normalization_test.cc (modified) (4 diffs)
• yat/normalization/Makefile.am (modified) (1 diff)
• yat/normalization/Spearman.h (added)

trunk/test/normalization_test.cc

@@ -25 +25 @@
 #include "yat/normalization/ColumnNormalizer.h"
 #include "yat/normalization/QuantileNormalizer.h"
+#include "yat/normalization/Spearman.h"
 
 #include "yat/utility/Matrix.h"
@@ -34 +35 @@
 void test_column_normalize(test::Suite&);
 void test_quantile_normalize(test::Suite&);
+void test_spearman(test::Suite&);
 
 int main(int argc, char* argv[])
@@ -43 +45 @@
   test_column_normalize(suite);
   test_quantile_normalize(suite);
+  test_spearman(suite);
 
   return suite.return_value();
@@ -105 +108 @@
 }
 
+void test_spearman(test::Suite& suite)
+{
+  suite.err() << "Testing Spearman\n";
+  normalization::Spearman spearman;
+  std::vector<double> vec;
+  vec.push_back(0);
+  vec.push_back(2);
+  vec.push_back(3);
+  vec.push_back(1);
+  spearman(vec.begin(), vec.end(), vec.begin());
+  std::vector<double> correct;
+  correct.push_back(0);
+  correct.push_back(0.5);
+  correct.push_back(0.75);
+  correct.push_back(0.25);
+  suite.equal_range(vec.begin(), vec.end(), correct.begin());
+}

trunk/yat/normalization/Makefile.am

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