Changeset 1735

Timestamp:

Jan 16, 2009, 10:33:53 PM (12 years ago)

Author:

Jari Häkkinen

Message:

Addresses #425. Taking care of some special cases. No iterative test is need.

Location:

trunk

Files:

• test/normalization_test.cc (modified) (2 diffs)
• yat/normalizer/qQuantileNormalizer.cc (modified) (3 diffs)

trunk/test/normalization_test.cc

@@ -150 +150 @@
   // Enough iteration will make all columns to have the same values as
   // the target.
-  suite.err() << "Testing that iterative normalization works\n";
+  suite.err() << "Testing that q=matrix rows gives QuantileNormaliztion\n";
   utility::Matrix m2(4,2);
   m2(0,0) = 0; m2(0,1) = 10;
@@ -159 +159 @@
   utility::Matrix result2(m2.rows(),m2.columns());
   qqn2(m2,result2);
-  for (int d=0; d<50; ++d)
-    qqn2(result2,result2);
   suite.add( suite.equal_fix(m2(0,0),result2(2,1),1.0e-12) &&
              suite.equal_fix(m2(1,0),result2(3,1),1.0e-12) &&

trunk/yat/normalizer/qQuantileNormalizer.cc

@@ -53 +53 @@
       for (unsigned int r=start; r<end; ++r)
         av.add(sortedvec(r));
-      average_(i)=av.mean();
-      index_(i)= static_cast<double>(end+start)/2;
+      average_(i) = av.mean();
+      index_(i)   = 0.5*(end+start-1);
       start=end;
     }
@@ -109 +109 @@
       size_t start=0;
       size_t end=static_cast<unsigned int>(idx(0));
-      if (end<idx(0))
+      // The first condition below takes care of limiting case number
+      // of parts approximately equal to the number of matrix rows and
+      // the second condition makes sure that index is larege enough
+      // when using cspline below ... the static cast above takes the
+      // floor whereas we want to take the "roof" forcing next index
+      // range to be within interpolation range for the cspline.
+      if ((end==0) || (end<idx(0)))
         ++end;
       for (size_t row=start; row<end; ++row) {
@@ -116 +122 @@
       }
 
-      // cspline interpolation for all data between the first and last
-      // parts
+      // cspline interpolation for all data between the mid points of
+      // the first and last part
       start=end;
       end=static_cast<unsigned int>(idx(target_.size()-1));
+      // take care of limiting case number of parts approximately
+      // equal to the number of matrix rows
+      if (end==(matrix.rows()-1))
+        --end;
       for (size_t row=start; row<=end; ++row) {
         size_t srow=sorted_index[column][row];