Changeset 1708
- Timestamp:
- Jan 13, 2009, 11:09:53 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 1 deleted
- 3 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/data/Makefile.am
r1572 r1708 3 3 ## $Id$ 4 4 5 # Copyright (C) 2007, 2008 Jari Häkkinen5 # Copyright (C) 2007, 2008, 2009 Jari Häkkinen 6 6 # 7 7 # 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 \ 25 25 nm_kernel.txt nm_kernel2.txt nm_kernel_gaussian.txt nm_target_bin.txt \ 26 rank_data.txt rank_target.txt regression_gauss.data \ 26 normalization_test.data rank_data.txt rank_target.txt \ 27 regression_gauss.data \ 27 28 sorlie_centroid_classes.txt sorlie_centroid_data.txt \ 28 29 sorlie_centroid_predictions.txt sorlie_centroids.txt vector1.data \ -
trunk/test/normalization_test.cc
r1573 r1708 3 3 /* 4 4 Copyright (C) 2008 Jari Häkkinen, Peter Johansson 5 Copyright (C) 2009 Jari Häkkinen 5 6 6 7 This file is part of the yat library, http://dev.thep.lu.se/yat … … 24 25 #include "yat/normalizer/Centralizer.h" 25 26 #include "yat/normalizer/ColumnNormalizer.h" 26 #include "yat/normalizer/CubicSplineNormalizer.h"27 27 #include "yat/normalizer/Gauss.h" 28 #include "yat/normalizer/qQuantileNormalizer.h" 28 29 #include "yat/normalizer/QuantileNormalizer.h" 29 30 #include "yat/normalizer/RowNormalizer.h" … … 44 45 void test_centralizer(test::Suite&); 45 46 void test_column_normalize(test::Suite&); 46 void test_cubicspline_normalize(test::Suite&);47 47 void test_gauss_normalize(test::Suite&); 48 void test_qquantile_normalize(test::Suite&); 48 49 void test_quantile_normalize(test::Suite&); 49 50 void test_row_normalize(test::Suite&); … … 59 60 test_centralizer(suite); 60 61 test_column_normalize(suite); 61 test_ cubicspline_normalize(suite);62 test_qquantile_normalize(suite); 62 63 test_quantile_normalize(suite); 63 64 test_gauss_normalize(suite); … … 120 121 121 122 122 void test_cubicspline_normalize(test::Suite& suite) 123 { 124 suite.err() << "Testing CubicSplineNormalizer\n"; 125 std::string data(test::filename("data/cubicspline.data")); 123 void test_qquantile_normalize(test::Suite& suite) 124 { 125 using namespace normalizer; 126 127 suite.err() << "Testing qQuantileNormalizer\n"; 128 std::string data(test::filename("data/normalization_test.data")); 126 129 if (utility::FileUtil(data.c_str()).permissions("r")) { 127 130 suite.add(false); … … 132 135 133 136 utility::Matrix m(data_stream); 137 utility::Matrix result(m.rows(),m.columns()); 138 139 // testing number of parts boundary conditions 140 qQuantileNormalizer(m.column_const_view(0),m.rows()); 141 qQuantileNormalizer(m.column_const_view(0),2); 142 143 qQuantileNormalizer qqn(m.column_const_view(0),9); // first column as target 144 qqn(m,result); 134 145 } 135 146 -
trunk/yat/normalizer/Makefile.am
r1568 r1708 3 3 ## $Id$ 4 4 5 # Copyright (C) 2008 Peter Johansson 5 # Copyright (C) 2008 Jari Häkkinen, Peter Johansson 6 # Copyright (C) 2009 Jari Häkkinen 6 7 # 7 8 # This file is part of the yat library, http://dev.thep.lu.se/yat … … 21 22 22 23 noinst_LTLIBRARIES = libnormalizer.la 23 libnormalizer_la_SOURCES = QuantileNormalizer.cc24 libnormalizer_la_SOURCES = qQuantileNormalizer.cc QuantileNormalizer.cc 24 25 25 26 include_normalizerdir = $(includedir)/yat/normalizer 26 27 27 28 include_normalizer_HEADERS = Centralizer.h ColumnNormalizer.h \ 28 CubicSplineNormalizer.h Gauss.h QuantileNormalizer.h RowNormalizer.h \29 Gauss.h qQuantileNormalizer.h QuantileNormalizer.h RowNormalizer.h \ 29 30 Spearman.h Zscore.h
Note: See TracChangeset
for help on using the changeset viewer.