Changeset 1531

Timestamp:

Sep 24, 2008, 11:47:41 PM (15 years ago)

Author:

Peter

Message:

working on WeightedIterator? refs #368

Location:

trunk

Files:

• test/iterator_test.cc (modified) (1 diff)
• yat/utility/WeightedIterator.h (modified) (3 diffs)

trunk/test/iterator_test.cc

@@ -412 +412 @@
   utility::WeightedIterator<Iter, Iter> iter(vec.begin(), vec.begin());
 
-  //test_trivial_iterator(iter, suite);
-
-}
+  test_input_iterator(iter, suite);
+
+}

trunk/yat/utility/WeightedIterator.h

@@ -23 +23 @@
 */
 
+#include <boost/iterator/iterator_facade.hpp>
+
 namespace theplu {
 namespace yat {
@@ -32 +34 @@
   template<typename DataIterator, typename WeightIterator>
   class WeightedIterator
+    : public boost::iterator_facade<
+    WeightedIterator<DataIterator, WeightIterator>,
+    DataWeight,
+    std::random_access_iterator_tag,
+    DataWeight>
+    
   {
   public:
@@ -58 +66 @@
 
   private:
+    friend class boost::iterator_core_access;
+
     DataIterator d_iter_;
     WeightIterator w_iter_;
+
+    DataWeight dereference(void) const 
+    { return DataWeight(*d_iter_, *w_iter_); }
+
+    void increment(void) { ++d_iter_; ++w_iter_; }
+
   };