Changeset 1374 for trunk/yat

Timestamp:

Jul 16, 2008, 6:34:45 PM (15 years ago)

Author:

Peter

Message:

fixes #391 - implemented specializations for StrideIterator? and Container2DIterator

Location:

trunk/yat/utility

Files:

• Container2DIterator.h (modified) (2 diffs)
• StrideIterator.h (modified) (1 diff)

trunk/yat/utility/Container2DIterator.h

@@ -289 +289 @@
   struct iterator_traits<Container2DIterator<A, B, C, D, E> > {
     /**
+       data_reference is defined by Policy class E::data_type
+     */
+    typedef typename E::data_type data_reference;
+
+    /**
+       data_reference is defined by Policy class E::weight_type
+     */
+    typedef typename E::weight_type weight_reference;
+
+    /**
        \return data
     */
-    double data(Container2DIterator<A, B, C, D, E> iter) const 
+    data_reference data(Container2DIterator<A, B, C, D, E> iter) const 
     { return iter.data(); }
 
@@ -297 +307 @@
        \return weight
     */
-    double weight(Container2DIterator<A, B, C, D, E> iter) const 
+    weight_reference weight(Container2DIterator<A, B, C, D, E> iter) const 
     { return iter.weight(); }
 

trunk/yat/utility/StrideIterator.h

@@ -57 +57 @@
   struct iterator_traits<StrideIterator<Iter> > {
     /**
-       \return data that is *iter
-    */
-    double data(StrideIterator<Iter> iter) const 
+       data_reference same as for underlying iterator
+     */
+    typedef typename iterator_traits<Iter>::data_reference data_reference;
+
+    /**
+       weight_reference same as for underlying iterator
+     */
+    typedef typename iterator_traits<Iter>::weight_reference weight_reference;
+
+    /**
+       \return data of iterator
+    */
+    data_reference data(StrideIterator<Iter> iter) const 
     { return iterator_traits<Iter>().data(iter.base()); }
 
     /**
-       \return 1.0
-    */
-    double weight(StrideIterator<Iter> iter) const 
+       \return weight of iterator
+    */
+    weight_reference weight(StrideIterator<Iter> iter) const 
     { return iterator_traits<Iter>().weight(iter.base()); }