- Timestamp:
- Aug 28, 2008, 4:56:42 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/Makefile.am
r1437 r1447 84 84 ncc_test_SOURCES = ncc_test.cc 85 85 nni_test_SOURCES = nni_test.cc 86 normalization_test_SOURCES = normalization_test.cc 86 87 pca_test_SOURCES = pca_test.cc 87 88 range_test_SOURCES = range_test.cc -
trunk/test/normalization_test.cc
r1445 r1447 71 71 m(1,1) = 4; 72 72 normalization::QuantileNormalizer qn; 73 qn(m );73 qn(m, m); 74 74 suite.err() << "Testing m(0,0)\n"; 75 75 suite.add(suite.equal(m(0,0), 2)); -
trunk/yat/normalization/QuantileNormalizer.cc
r1432 r1447 35 35 namespace normalization { 36 36 37 void QuantileNormalizer::operator()(utility::Matrix& data) const 37 void QuantileNormalizer::operator()(const utility::Matrix& data, 38 utility::Matrix& result) const 38 39 { 39 40 utility::Matrix data_copy(data); … … 50 51 } 51 52 52 for (size_t column=0; column< data.columns(); ++column){53 for (size_t column=0; column<result.columns(); ++column){ 53 54 std::vector<size_t> index; 54 utility::sort_index(index, data.column_const_view(column));55 utility::sort_index(index, result.column_const_view(column)); 55 56 56 for (size_t row=0; row< data.rows(); ++row)57 data(index[row], column) = averager[row].mean();57 for (size_t row=0; row<result.rows(); ++row) 58 result(index[row], column) = averager[row].mean(); 58 59 } 59 60 } -
trunk/yat/normalization/QuantileNormalizer.h
r1445 r1447 45 45 within a column is preserved in the normalization. 46 46 */ 47 void operator()(utility::Matrix& matrix) const; 47 void operator()(const utility::Matrix& matrix, 48 utility::Matrix& result) const; 48 49 }; 49 50
Note: See TracChangeset
for help on using the changeset viewer.