Changeset 2157 for trunk/yat/normalizer/Zscore.h

Timestamp:

Jan 18, 2010, 1:19:52 AM (13 years ago)

Author:

Peter

Message:

refs #498. Zscore now works with mixed iterators and also refined requirements on iterator types

File:

• trunk/yat/normalizer/Zscore.h (modified) (3 diffs)

trunk/yat/normalizer/Zscore.h

@@ -24 +24 @@
 */
 
+#include "utility.h"
+
 #include "yat/statistics/Averager.h"
 #include "yat/statistics/AveragerWeighted.h"
 
 #include "yat/utility/iterator_traits.h"
+
+#include <boost/concept_check.hpp>
 
 namespace theplu {
@@ -56 +60 @@
        same. \see std::transform
      */
-    template<class InputIterator, class OutputIterator>
-    void operator()(InputIterator first, InputIterator last,
-                    OutputIterator result) const
+    template<class ForwardIter1, class ForwardIter2>
+    void operator()(ForwardIter1 first, ForwardIter1 last,
+                    ForwardIter2 result) const
     {
-      typename utility::weighted_iterator_traits<InputIterator>::type tag;
+      typename utility::weighted_if_any2<ForwardIter1, ForwardIter2>::type tag;
       normalize(first, last, result, tag);
     }
 
   private:
-    template<class InputIterator, class OutputIterator>
-    void normalize(InputIterator first,InputIterator last,OutputIterator result,
+    template<class ForwardIterator, class OutputIterator>
+    void normalize(ForwardIterator first, ForwardIterator last,
+                   OutputIterator result,
                    utility::unweighted_iterator_tag tag) const
     {
+      // we requre forward iterator since we iterate through the range
+      // multiple times.
+      BOOST_CONCEPT_ASSERT((boost::ForwardIterator<ForwardIterator>));
+      BOOST_CONCEPT_ASSERT((boost::OutputIterator<OutputIterator, double>));
       statistics::Averager a;
       add(a, first, last);
@@ -80 +89 @@
     }
 
-    template<class InputIterator, class OutputIterator>
-    void normalize(InputIterator first,InputIterator last,OutputIterator result,
+    template<class ForwardIter1, class ForwardIter2>
+    void normalize(ForwardIter1 first, ForwardIter1 last, ForwardIter2 result,
                    utility::weighted_iterator_tag tag) const
     {
-      std::copy(utility::weight_iterator(first), 
-                utility::weight_iterator(last), 
-                utility::weight_iterator(result));
+      // we requre forward iterator since we iterate through the range
+      // multiple times.
+      BOOST_CONCEPT_ASSERT((boost::ForwardIterator<ForwardIter1>));
+      BOOST_CONCEPT_ASSERT((boost::Mutable_ForwardIterator<ForwardIter2>));
+      detail::copy_weight_if_weighted(first, last, result);
       statistics::AveragerWeighted a;
       add(a, first, last);
       double m = a.mean();
       double std = a.std();
-      utility::iterator_traits<InputIterator> trait;
+      utility::iterator_traits<ForwardIter1> in_trait;
+      utility::iterator_traits<ForwardIter2> out_trait;
       while (first!=last) {
-        trait.data(result) = (trait.data(first) - m) / std;
+        out_trait.data(result) = (in_trait.data(first) - m) / std;
         ++first;
         ++result;