Changeset 1708

Timestamp:

Jan 13, 2009, 11:09:53 AM (13 years ago)

Author:

Jari Häkkinen

Message:

Addresses #425

Location:

trunk

Files:

• test/data/Makefile.am (modified) (2 diffs)
• test/data/normalization_test.data (moved) (moved from trunk/test/data/cubicspline.data)
• test/normalization_test.cc (modified) (6 diffs)
• yat/normalizer/CubicSplineNormalizer.h (deleted)
• yat/normalizer/Makefile.am (modified) (2 diffs)
• yat/normalizer/qQuantileNormalizer.cc (added)
• yat/normalizer/qQuantileNormalizer.h (added)

trunk/test/data/Makefile.am

@@ -3 +3 @@
 ## $Id$
 
-# Copyright (C) 2007, 2008 Jari Häkkinen
+# Copyright (C) 2007, 2008, 2009 Jari Häkkinen
 #
 # This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -24 +24 @@
 knni_weight.data nm_alpha_linear_matlab.txt nm_data_centralized.txt \
 nm_kernel.txt nm_kernel2.txt nm_kernel_gaussian.txt nm_target_bin.txt \
-rank_data.txt rank_target.txt regression_gauss.data     \
+normalization_test.data rank_data.txt rank_target.txt \
+regression_gauss.data \
 sorlie_centroid_classes.txt sorlie_centroid_data.txt      \
 sorlie_centroid_predictions.txt sorlie_centroids.txt vector1.data \

trunk/test/normalization_test.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2008 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2009 Jari Häkkinen
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -24 +25 @@
 #include "yat/normalizer/Centralizer.h"
 #include "yat/normalizer/ColumnNormalizer.h"
-#include "yat/normalizer/CubicSplineNormalizer.h"
 #include "yat/normalizer/Gauss.h"
+#include "yat/normalizer/qQuantileNormalizer.h"
 #include "yat/normalizer/QuantileNormalizer.h"
 #include "yat/normalizer/RowNormalizer.h"
@@ -44 +45 @@
 void test_centralizer(test::Suite&);
 void test_column_normalize(test::Suite&);
-void test_cubicspline_normalize(test::Suite&);
 void test_gauss_normalize(test::Suite&);
+void test_qquantile_normalize(test::Suite&);
 void test_quantile_normalize(test::Suite&);
 void test_row_normalize(test::Suite&);
@@ -59 +60 @@
   test_centralizer(suite);
   test_column_normalize(suite);
-  test_cubicspline_normalize(suite);
+  test_qquantile_normalize(suite);
   test_quantile_normalize(suite);
   test_gauss_normalize(suite);
@@ -120 +121 @@
 
 
-void test_cubicspline_normalize(test::Suite& suite)
-{
-  suite.err() << "Testing CubicSplineNormalizer\n";
-  std::string data(test::filename("data/cubicspline.data"));
+void test_qquantile_normalize(test::Suite& suite)
+{
+  using namespace normalizer;
+
+  suite.err() << "Testing qQuantileNormalizer\n";
+  std::string data(test::filename("data/normalization_test.data"));
   if (utility::FileUtil(data.c_str()).permissions("r")) {
     suite.add(false);
@@ -132 +135 @@
 
   utility::Matrix m(data_stream);
+  utility::Matrix result(m.rows(),m.columns());
+
+  // testing number of parts boundary conditions
+  qQuantileNormalizer(m.column_const_view(0),m.rows());
+  qQuantileNormalizer(m.column_const_view(0),2);
+
+  qQuantileNormalizer qqn(m.column_const_view(0),9);  // first column as target
+  qqn(m,result);
 }
 

trunk/yat/normalizer/Makefile.am

@@ -3 +3 @@
 ## $Id$
 
-# Copyright (C) 2008 Peter Johansson
+# Copyright (C) 2008 Jari Häkkinen, Peter Johansson
+# Copyright (C) 2009 Jari Häkkinen
 #
 # This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -21 +22 @@
 
 noinst_LTLIBRARIES = libnormalizer.la
-libnormalizer_la_SOURCES = QuantileNormalizer.cc
+libnormalizer_la_SOURCES = qQuantileNormalizer.cc QuantileNormalizer.cc
 
 include_normalizerdir = $(includedir)/yat/normalizer
 
 include_normalizer_HEADERS = Centralizer.h ColumnNormalizer.h \
-  CubicSplineNormalizer.h Gauss.h QuantileNormalizer.h RowNormalizer.h  \
+  Gauss.h qQuantileNormalizer.h QuantileNormalizer.h RowNormalizer.h  \
   Spearman.h Zscore.h