Changeset 1088 for trunk/yat/statistics

Timestamp:

Feb 14, 2008, 3:26:19 PM (16 years ago)

Author:

Peter

Message:

Closes #247. Removed IteratorWeighted? iterators over weighted container instead can use Iterator with a special Policy.

Location:

trunk/yat/statistics

Files:

• AveragerPairWeighted.h (modified) (1 diff)
• AveragerWeighted.h (modified) (1 diff)

trunk/yat/statistics/AveragerPairWeighted.h

@@ -149 +149 @@
   {
     for ( ; first1 != last1; ++first1, ++first2) {
-      ap.add(utility::iterator_traits_data(first1), 
-             utility::iterator_traits_data(first2),
-             utility::iterator_traits_weight(first1), 
-             utility::iterator_traits_weight(first2));
+      ap.add(utility::iterator_traits<Iter1>().data(first1), 
+             utility::iterator_traits<Iter2>().data(first2),
+             utility::iterator_traits<Iter1>().weight(first1), 
+             utility::iterator_traits<Iter2>().weight(first2));
     }
   }

trunk/yat/statistics/AveragerWeighted.h

@@ -218 +218 @@
   {
     for ( ; first != last; ++first)
-      a.add(utility::iterator_traits_data(first),
-            utility::iterator_traits_weight(first));
+      a.add(utility::iterator_traits<Iter>().data(first),
+            utility::iterator_traits<Iter>().weight(first));
   }