Changeset 1376 for trunk/yat

Timestamp:

Jul 16, 2008, 9:32:20 PM (14 years ago)

Author:

Peter

Message:

add WeightIterator? - fixes #369

Location:

trunk/yat/utility

Files:

• DataIterator.h (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• WeightIterator.h (copied) (copied from trunk/yat/utility/DataIterator.h) (5 diffs)

trunk/yat/utility/DataIterator.h

@@ -24 +24 @@
   02111-1307, USA.
 */
+
+#include "iterator_traits.h"
 
 #include <boost/iterator/iterator_adaptor.hpp>

trunk/yat/utility/Makefile.am

@@ -47 +47 @@
   SVD.h TypeInfo.h utility.h Vector.h \
   VectorBase.h VectorConstView.h VectorMutable.h VectorView.h \
-  WeNNI.h yat_assert.h
+  WeightIterator.h WeNNI.h yat_assert.h
 

trunk/yat/utility/WeightIterator.h

@@ -1 @@
-#ifndef _theplu_yat_utility_data_iterator_
-#define _theplu_yat_utility_data_iterator_
+#ifndef _theplu_yat_utility_weight_iterator_
+#define _theplu_yat_utility_weight_iterator_
 
 // $Id$
@@ -36 +36 @@
   */
   template<typename Base>
-  class DataIterator
+  class WeightIterator
     : public boost::iterator_adaptor<
-    DataIterator<Base>               // Derived
+    WeightIterator<Base>               // Derived
     , Base                          // Base
-    , boost::remove_reference<typename iterator_traits<Base>::data_reference> 
+    , boost::remove_reference<typename iterator_traits<Base>::weight_reference> 
     , boost::forward_traversal_tag    // CategoryOrTraversal
-    , typename iterator_traits<Base>::data_reference // Reference
+    , typename iterator_traits<Base>::weight_reference // Reference
     >
 
@@ -50 +50 @@
        \brief Constructor from \a Base iterator
      */
-    explicit DataIterator(Base b)
-      : DataIterator::iterator_adaptor_(b) {}
+    explicit WeightIterator(Base b)
+      : WeightIterator::iterator_adaptor_(b) {}
 
     /**
@@ -58 +58 @@
        \return data
      */
-    typename iterator_traits<Base>::data_reference operator*(void) const
-    { return iterator_traits<Base>().data(this->base()); }
+    typename iterator_traits<Base>::weight_reference operator*(void) const
+    { return iterator_traits<Base>().weight(this->base()); }
 
   private:
@@ -70 +70 @@
    */
   template<typename Base>
-  DataIterator<Base> make_data_iterator(Base base)
+  WeightIterator<Base> make_weight_iterator(Base base)
   {
-    return DataIterator<Base>(base);
+    return WeightIterator<Base>(base);
   }