Changeset 1740

Timestamp:

Jan 21, 2009, 2:03:13 PM (14 years ago)

Author:

Peter

Message:

addresses #478 - implemented weighted normalization. Need to add test especially to test that the templates compile.

Location:

trunk

Files:

• test/normalization_test.cc (modified) (1 diff)
• yat/normalizer/qQuantileNormalizer.h (modified) (5 diffs)

trunk/test/normalization_test.cc

@@ -153 +153 @@
   // Enough iteration will make all columns to have the same values as
   // the target.
-  suite.err() << "Testing that q=matrix rows gives QuantileNormaliztion\n";
+  suite.err() << "Testing that q=matrix rows gives QuantileNormalization\n";
   utility::Matrix m2(4,2);
   m2(0,0) = 0; m2(0,1) = 10;

trunk/yat/normalizer/qQuantileNormalizer.h

@@ -22 +22 @@
 
 #include "yat/regression/CSplineInterpolation.h"
+#include "yat/utility/DataIterator.h"
 #include "yat/utility/DataWeight.h"
 #include "yat/utility/iterator_traits.h"
 #include "yat/utility/Vector.h"
+#include "yat/utility/WeightIterator.h"
 #include "yat/utility/yat_assert.h"
 
@@ -158 +160 @@
 
     Partitioner target_;
+
+    // unweighted version
+    template<typename RandomAccessIterator1, typename RandomAccessIterator2>
+    void normalize(const Partitioner& source,RandomAccessIterator1 first, 
+                   RandomAccessIterator1 last, RandomAccessIterator2 result,
+                   utility::unweighted_iterator_tag tag) const;
+
+    // weighted version
+    // copy weights and apply unweighted version on data part
+    template<typename RandomAccessIterator1, typename RandomAccessIterator2>
+    void normalize(const Partitioner& source,RandomAccessIterator1 first, 
+                   RandomAccessIterator1 last, RandomAccessIterator2 result,
+                   utility::weighted_iterator_tag tag) const;
   };
 
@@ -179 +194 @@
                                        RandomAccessIterator2 result) const
   {
+    Partitioner source(first, last, target_.size());
+    typename utility::weighted_iterator_traits<RandomAccessIterator2>::type tag;
+    normalize(source, first, last, result, tag);
+  }
+
+
+  template<typename RandomAccessIterator1, typename RandomAccessIterator2>
+  void 
+  qQuantileNormalizer::normalize(const qQuantileNormalizer::Partitioner& source,
+                                 RandomAccessIterator1 first, 
+                                 RandomAccessIterator1 last, 
+                                 RandomAccessIterator2 result,
+                                 utility::unweighted_iterator_tag tag) const
+  {
     size_t N = last-first;
     utility::yat_assert<std::runtime_error>
@@ -186 +215 @@
     utility::sort_index(first, last, sorted_index);
 
-    Partitioner source(first, last, target_.size());
     utility::Vector diff(source.averages());
     diff-=target_.averages();
@@ -233 +261 @@
 
 
+  template<typename RandomAccessIterator1, typename RandomAccessIterator2>
+  void qQuantileNormalizer::normalize(const Partitioner& source,
+                                      RandomAccessIterator1 first, 
+                                      RandomAccessIterator1 last, 
+                                      RandomAccessIterator2 result,
+                                      utility::weighted_iterator_tag tag) const
+  {
+    // copy the weights
+    std::copy(utility::weight_iterator<RandomAccessIterator1>(first), 
+              utility::weight_iterator<RandomAccessIterator1>(last), 
+              utility::weight_iterator<RandomAccessIterator2>(result)); 
+    // apply algorithm on data part of range
+    normalize(source, utility::data_iterator<RandomAccessIterator1>(first),
+              utility::data_iterator<RandomAccessIterator1>(last),
+              utility::data_iterator<RandomAccessIterator2>(result),
+              utility::unweighted_iterator_tag());
+  }
+
+
   template<typename BidirectionalIterator>
   qQuantileNormalizer::Partitioner::Partitioner(BidirectionalIterator first,