Changeset 1737

Timestamp:

Jan 19, 2009, 9:40:06 PM (12 years ago)

Author:

Peter

Message:

addresses #478 - preparing for weighted version

Location:

trunk

Files:

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

trunk/test/normalization_test.cc

@@ -46 +46 @@
 void test_gauss_normalize(test::Suite&);
 void test_qquantile_normalize(test::Suite&);
+void test_qquantile_normalize_weighted(test::Suite&);
 void test_quantile_normalize(test::Suite&);
 void test_row_normalize(test::Suite&);
@@ -60 +61 @@
   test_column_normalize(suite);
   test_qquantile_normalize(suite);
+  test_qquantile_normalize_weighted(suite);
   test_quantile_normalize(suite);
   test_gauss_normalize(suite);
@@ -165 +167 @@
              suite.equal_fix(m2(2,0),result2(1,1),1.0e-12) &&
              suite.equal_fix(m2(3,0),result2(0,1),1.0e-12) );
+}
+
+
+void test_qquantile_normalize_weighted(test::Suite& suite)
+{
+  using namespace normalizer;
+
+  suite.err() << "Testing qQuantileNormalizer weighted\n";
+
+  std::vector<utility::DataWeight> vec;
+  vec.reserve(100);
+  for (size_t i=0; i<100; ++i)
+    vec.push_back(utility::DataWeight(i, 1.0));
+  //qQuantileNormalizer(vec.begin(), vec.end(), 5);
 }
 

trunk/yat/normalizer/qQuantileNormalizer.h

@@ -22 +22 @@
 
 #include "yat/regression/CSplineInterpolation.h"
+#include "yat/utility/DataWeight.h"
+#include "yat/utility/iterator_traits.h"
 #include "yat/utility/Vector.h"
 #include "yat/utility/yat_assert.h"
@@ -28 +30 @@
 #include <iterator>
 #include <stdexcept>
+#include <vector>
 
 namespace theplu {
@@ -139 +142 @@
 
   private:
+    // unweighted "constructor"
+    template<typename Iterator>
+    void build(Iterator first, Iterator last, unsigned int N, 
+               utility::unweighted_iterator_tag);
     void init(const utility::VectorBase&, unsigned int N);
 
@@ -230 +237 @@
     : average_(utility::Vector(N)), index_(utility::Vector(N))
   {
+    typedef typename 
+      utility::weighted_iterator_traits<BidirectionalIterator>::type tag;
+    build(first, last, N, tag());
+          
+  }
+
+
+  template<typename Iterator>
+  void qQuantileNormalizer::Partitioner::build(Iterator first, Iterator last, 
+                                               unsigned int N, 
+                                               utility::unweighted_iterator_tag)
+  {
     utility::Vector vec(std::distance(first, last));
     std::copy(first, last, vec.begin());