Changeset 1088 for trunk/yat/utility/iterator_traits.h

Timestamp:

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

Author:

Peter

Message:

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

File:

• trunk/yat/utility/iterator_traits.h (modified) (1 diff)

trunk/yat/utility/iterator_traits.h

@@ -120 +120 @@
 
   /**
-    Function to be used to make compile-time decision how to return
-    data from an iterator separating two cases: weighted and
-    unweighted.
+     \brief traits to make unweighted iterator work in as a weighted
 
-    In this way unweighted iterators can be used in a weighted context.
+     This class must be implemented for every iterator that can be weighted.
+
+     \see StrideIterator and Iterator
    */ 
-  // Peter, perhaps these should be templatized, but for now return
-  // type double is hard coded.
   template <class Iter>
-  double iterator_traits_data(Iter iter)
-  { return iterator_traits_data(iter, typename 
-                                weighted_iterator_traits<Iter>::type()); } 
+  struct iterator_traits {
+    // Peter, perhaps these should be templatized, but for now return
+    // type double is hard coded.
+    /**
+       \return data that is *iter
+    */
+    double data(Iter iter) const 
+    { check_iterator_is_unweighted(iter); return *iter; }
 
-  /**
-     \return data for weighted iterator
-   */
-  template <class Iter>
-  double iterator_traits_data(Iter i, weighted_type)
-  { return i.data(); } 
+    /**
+       \return 1.0
+    */
+    double weight(Iter iter) const 
+    { check_iterator_is_unweighted(iter); return 1.0; }
 
-  /**
-     \return data for unweighted data
-   */
-  template <class Iter>
-  double iterator_traits_data(Iter i, unweighted_type)
-  { return *i; } 
-
-  /**
-    Function to be used to make compile-time decision how to return
-    data from an iterator separating two cases: weighted and
-    unweighted.
-
-    In this way unweighted iterators can be used in a weighted context
-    and weight will be set to unity.
-   */ 
-  // Peter, perhaps these should be templatized, but for now return
-  // type double is hard coded.
-  template <class Iter>
-  double iterator_traits_weight(Iter iter)
-  { return iterator_traits_weight(iter, typename 
-                                  weighted_iterator_traits<Iter>::type()); } 
-
-  /**
-     \return weight for weighted iterator
-   */
-  template <class Iter>
-  double iterator_traits_weight(Iter i, weighted_type)
-  { return i.weight(); } 
-
-  /**
-     \return weight for unweighted iterator
-   */
-  template <class Iter>
-  double iterator_traits_weight(Iter i, unweighted_type)
-  { return 1.0; } 
-
+  };
 
 }}} // of namespace utility, yat, and theplu