Changeset 1739 for trunk/yat/normalizer/Centralizer.h

Timestamp:

Jan 21, 2009, 2:34:18 AM (12 years ago)

Author:

Peter

Message:

fixes #479 and removing some debug output

File:

• trunk/yat/normalizer/Centralizer.h (modified) (4 diffs)

trunk/yat/normalizer/Centralizer.h

@@ -74 +74 @@
 
        \see std::transform
-
-       \return result + (last-first)
      */
     template<class InputIterator, class OutputIterator>
-    OutputIterator operator()(InputIterator first, InputIterator last,
-                              OutputIterator result) const
+    void operator()(InputIterator first, InputIterator last,
+                    OutputIterator result) const
     {
       typename utility::weighted_iterator_traits<InputIterator>::type tag;
-      return normalize(first, last, result, tag);
-                       
+      normalize(first, last, result, tag);
     }
 
@@ -91 +88 @@
     // unweighted version
     template<class InputIterator, class OutputIterator>
-    OutputIterator normalize(InputIterator first, InputIterator last,
-                             OutputIterator result,
-                             utility::unweighted_iterator_tag tag) const
+    void normalize(InputIterator first,InputIterator last,OutputIterator result,
+                   utility::unweighted_iterator_tag tag) const
     {
-      return std::transform(first, last, 
-                            result, std::bind2nd(std::minus<double>(),
-                                                 func_(first, last)));
+      std::transform(first, last, result, 
+                     std::bind2nd(std::minus<double>(), func_(first, last)));
     }
 
@@ -103 +98 @@
     // weighted version
     template<class InputIterator, class OutputIterator>
-    OutputIterator normalize(InputIterator first, InputIterator last,
-                             OutputIterator result,
-                             utility::weighted_iterator_tag tag) const
+    void normalize(InputIterator first,InputIterator last,OutputIterator result,
+                   utility::weighted_iterator_tag tag) const
     {
       std::copy(utility::weight_iterator(first), 
@@ -113 +107 @@
                      utility::data_iterator(last), 
                      utility::data_iterator(result),
-                     std::bind2nd(std::minus<double>(), 
-                                  func_(first, last)));
-      return result + std::distance(first, last);
+                     std::bind2nd(std::minus<double>(),func_(first, last)));
     }