Changeset 1365 for trunk/yat

Timestamp:

Jul 10, 2008, 10:30:07 PM (15 years ago)

Author:

Peter

Message:

working on ticket:369 - created a DataIterator? that seems to work. However, it can't work in a mutable fashion because of limitations in iterator_traits (see #391). Also there should be a WeightIterator? before ticket:369 can be closed

Location:

trunk/yat/utility

Files:

• DataIterator.h (moved) (moved from trunk/yat/utility/IteratorData.h) (3 diffs)
• Makefile.am (modified) (1 diff)
• iterator_traits.h (modified) (1 diff)

trunk/yat/utility/DataIterator.h

@@ -1 @@
-#ifndef _theplu_yat_utility_iterator_data_
-#define _theplu_yat_utility_iterator_data_
+#ifndef _theplu_yat_utility_data_iterator_
+#define _theplu_yat_utility_data_iterator_
 
 // $Id$
@@ -25 +25 @@
 */
 
-#include "yat_assert.h"
+#include <boost/iterator/iterator_adaptor.hpp>
 
 namespace theplu {
@@ -32 +32 @@
 
   /**
-     @brief Iterator
+     @brief DataIterator
   */
-  template<typename T>
-  class IteratorData
+  template<typename Base>
+  class DataIterator
+    : public boost::iterator_adaptor<
+    DataIterator<Base>               // Derived
+    , Base                          // Base
+    , double              // Value
+    , boost::forward_traversal_tag    // CategoryOrTraversal
+    , double
+    >
+
   {
   public:
-    IteratorData(T);
+    explicit DataIterator(Base b)
+      : DataIterator::iterator_adaptor_(b) {}
+
+    double operator*(void) const
+    { return iterator_traits<Base>().data(this->base()); }
 
   private:
-    T base_;
   };
 
-  template<typename T>
-  IteratorData<T>::IteratorData(T base)
-    : base_(base)
-  {}
+  /**
+     \brief convenient function to create DataIterator
+
+     Convenient function in same fashion as std::make_pair.
+   */
+  template<typename Base>
+  DataIterator<Base> make_data_iterator(Base base)
+  {
+    return DataIterator<Base>(base);
+  }
+  
 
 

trunk/yat/utility/Makefile.am

@@ -38 +38 @@
 include_utility_HEADERS = \
   Alignment.h ColumnStream.h CommandLine.h \
-  Container2DIterator.h \
-  Exception.h FileUtil.h Index.h IteratorData.h \
+  Container2DIterator.h DataIterator.h \
+  Exception.h FileUtil.h Index.h \
   IteratorPolicy.h iterator_traits.h \
   kNNI.h Matrix.h NNI.h \

trunk/yat/utility/iterator_traits.h

@@ -135 +135 @@
      This class must be implemented for every iterator that can be weighted.
 
-     \see StrideIterator and Iterator
+     \see StrideIterator and Container2DIterator
    */ 
   template <class Iter>