Changeset 910 for trunk/yat/statistics

Timestamp:

Sep 29, 2007, 2:20:10 AM (16 years ago)

Author:

Peter

Message:

impl add function for AveragerWeighted?. The function distinguishes between normal iterators and weighted iterators, and call the member add function appropriately. refs #246

Location:

trunk/yat/statistics

Files:

• Averager.h (modified) (1 diff)
• AveragerWeighted.h (modified) (2 diffs)

trunk/yat/statistics/Averager.h

@@ -195 +195 @@
      \brief adding a ranges of values to Averager \a a
    */
-  template <class Aver, typename Iter>
-  void add(Aver& a, Iter first, Iter last)
+  template <typename Iter>
+  void add(Averager& a, Iter first, Iter last)
   {
     for ( ; first != last; ++first)

trunk/yat/statistics/AveragerWeighted.h

@@ -28 +28 @@
 
 #include "Averager.h"
+#include "yat/utility/IteratorTraits.h"
 
 #include <cmath>
@@ -219 +220 @@
   };
 
+  /**
+     \brief adding a ranges of values to Averager \a a
+   */
+  template <typename Iter>
+  void add(AveragerWeighted& a, Iter first, Iter last)
+  {
+    add(a, first, last, 
+        typename utility::weighted_iterator_traits<Iter>::type());
+  }
+
+
+  // unweighted impl.
+  template <typename Iter>
+  void add(AveragerWeighted& a, Iter first, Iter last, 
+           utility::unweighted_type type)
+  {
+    for ( ; first != last; ++first)
+      a.add(*first);
+  }
+
+  // weighted impl.
+  template <typename Iter>
+  void add(AveragerWeighted& a, Iter first, Iter last, 
+           utility::weighted_type type)
+  {
+    for ( ; first != last; ++first)
+      a.add(first.data(), first.weight());
+  }
+
+
   // Template implementations
   template <typename T1, typename T2>