Changeset 1523

Timestamp:

Sep 23, 2008, 7:32:49 PM (14 years ago)

Author:

Peter

Message:

fixes #442

Location:

trunk

Files:

• test/normalization_test.cc (modified) (1 diff)
• yat/normalizer/Centralizer.h (modified) (3 diffs)

trunk/test/normalization_test.cc

@@ -74 +74 @@
   for (size_t i=0; i<vec.size(); ++i)
     suite.add(suite.equal(vec[i], static_cast<double>(i)-1.0));
+
+  std::vector<utility::DataWeight> vec2;
+  vec2.push_back(utility::DataWeight(1,1));
+  vec2.push_back(utility::DataWeight(2,0.5));
+  vec2.push_back(utility::DataWeight(2,0.5));
+  std::vector<utility::DataWeight> vec3(vec2.size());
+  c(vec2.begin(), vec2.end(), vec3.begin());
+  for (size_t i=0; i<vec2.size(); ++i)
+    suite.add(suite.equal(vec3[i].weight(), vec2[i].weight()));
+  suite.add(suite.equal(vec3[0].data(), -0.5));
+  suite.add(suite.equal(vec3[1].data(), 0.5));
+  suite.add(suite.equal(vec3[2].data(), 0.5));
+
 }
 

trunk/yat/normalizer/Centralizer.h

@@ -22 +22 @@
 
 #include "yat/statistics/Average.h"
+#include "yat/utility/DataIterator.h"
+#include "yat/utility/iterator_traits.h"
+#include "yat/utility/WeightIterator.h"
 
 #include <algorithm>
@@ -73 +76 @@
                               OutputIterator result) const
     {
+      typename utility::weighted_iterator_traits<InputIterator>::type tag;
+      return normalize(first, last, result, tag);
+                       
+    }
+
+  private:
+    UnaryFunction func_;
+
+    // unweighted version
+    template<class InputIterator, class OutputIterator>
+    OutputIterator normalize(InputIterator first, InputIterator last,
+                             OutputIterator result,
+                             utility::unweighted_iterator_tag tag) const
+    {
       return std::transform(first, last, 
                             result, std::bind2nd(std::minus<double>(),
@@ -78 +95 @@
     }
 
-  private:
-    UnaryFunction func_;
+
+    // weighted version
+    template<class InputIterator, class OutputIterator>
+    OutputIterator normalize(InputIterator first, InputIterator last,
+                             OutputIterator result,
+                             utility::weighted_iterator_tag tag) const
+    {
+      std::copy(utility::weight_iterator(first), 
+                utility::weight_iterator(last), 
+                utility::weight_iterator(result));
+      std::transform(utility::data_iterator(first), 
+                     utility::data_iterator(last), 
+                     utility::data_iterator(result),
+                     std::bind2nd(std::minus<double>(), 
+                                  func_(first, last)));
+      return result + std::distance(first, last);
+    }
+
   };