Changeset 1518 for trunk/yat/normalizer/QuantileNormalizer.cc

Timestamp:

Sep 21, 2008, 6:07:45 AM (14 years ago)

Author:

Peter

Message:

changed implementation of a couple of normalizer so that operator() takes two matrices of which one is an input marix and one is a result matrix, i.e., the result does only depend on the input matrix and the result is only used as a receiver - I think this behaviour is more intuitive, although it is not as general as the previous one. We should probably document somewhere how we expect a 2Dnormalizer to behave (refs #425).

File:

• trunk/yat/normalizer/QuantileNormalizer.cc (modified) (3 diffs)

trunk/yat/normalizer/QuantileNormalizer.cc

@@ -39 +39 @@
   {
     assert(data.rows()==result.rows());
+    assert(data.columns()==result.columns());
+
+    // create a tmp copy
     utility::Matrix data_copy(data);
     
@@ -48 +51 @@
     // calculate average of each row
     std::vector<yat::statistics::Averager> averager(data_copy.rows());
-    for (size_t row=0; row<data_copy.rows(); ++row){
+    for (size_t row=0; row<result.rows(); ++row){
       add(averager[row], data_copy.begin_row(row), data_copy.end_row(row));
     }
@@ -54 +57 @@
     for (size_t column=0; column<result.columns(); ++column){
       std::vector<size_t> index;
-      utility::sort_index(index, result.column_const_view(column));
+      utility::sort_index(index, data.column_const_view(column));
                                
-      for (size_t row=0; row<result.rows(); ++row)
+      for (size_t row=0; row<data.rows(); ++row)
         result(index[row], column) = averager[row].mean();
     }