Changeset 1524

Timestamp:

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

Author:

Peter

Message:

fixes #443

Location:

trunk

Files:

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

trunk/test/normalization_test.cc

@@ -247 +247 @@
   for (size_t i=0; i<vec.size(); ++i)
     suite.add(suite.equal(vec[i], 2.0*i-1.0));
-}
-
-
+
+  std::vector<utility::DataWeight> vec2;
+  vec2.push_back(utility::DataWeight(1,1));
+  vec2.push_back(utility::DataWeight(2.13,0.5));
+  vec2.push_back(utility::DataWeight(2.13,0.5));
+  std::vector<utility::DataWeight> vec3(vec2.size());
+  zscore(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(), -1.0));
+  suite.add(suite.equal(vec3[1].data(), 1.0));
+  suite.add(suite.equal(vec3[2].data(), 1.0));
+}
+
+

trunk/yat/normalizer/Zscore.h

@@ -22 +22 @@
 
 #include "yat/statistics/Averager.h"
+#include "yat/statistics/AveragerWeighted.h"
+
+#include "yat/utility/iterator_traits.h"
 
 namespace theplu {
@@ -53 +56 @@
                               OutputIterator result) const
     {
+      typename utility::weighted_iterator_traits<InputIterator>::type tag;
+      return normalize(first, last, result, tag);
+    }
+
+  private:
+    template<class InputIterator, class OutputIterator>
+    OutputIterator normalize(InputIterator first, InputIterator last,
+                             OutputIterator result,
+                             utility::unweighted_iterator_tag tag) const
+    {
       statistics::Averager a;
       add(a, first, last);
@@ -65 +78 @@
     }
 
+    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));
+      statistics::AveragerWeighted a;
+      add(a, first, last);
+      double m = a.mean();
+      double std = a.std();
+      utility::iterator_traits<InputIterator> trait;
+      while (first!=last) {
+        trait.data(result) = (trait.data(first) - m) / std;
+        ++first;
+        ++result;
+      }
+      return result;
+    }
+
   };