Changeset 1386 for trunk

Timestamp:

Jul 22, 2008, 10:18:51 PM (13 years ago)

Author:

Peter

Message:

fixes #402 - constness conversion in StrideIterator?

Location:

trunk

Files:

• test/iterator_test.cc (modified) (2 diffs)
• yat/utility/StrideIterator.h (modified) (2 diffs)

trunk/test/iterator_test.cc

@@ -117 +117 @@
   suite.add(data_iter2 == data_iter5);
   suite.add(data_iter4 == data_iter5);
+  utility::StrideIterator<std::vector<double>::const_iterator> stride_ci(c_iter);
+  utility::StrideIterator<std::vector<double>::iterator> stride_i(iter);
+  suite.add(stride_ci==stride_i);
+  suite.add(stride_i==stride_ci);
 
   utility::MatrixWeighted x_weighted(3,4);
@@ -124 +128 @@
   *(x_weighted.begin()+1) = element;
   double element_data = *make_data_iterator(x_weighted.begin());
+  suite.add(element_data==x_weighted.begin()->data());
 
   classifier::MatrixLookup ml(m);

trunk/yat/utility/StrideIterator.h

@@ -28 +28 @@
 #include "iterator_traits.h"
 #include "yat_assert.h"
+
+#include <boost/iterator/iterator_adaptor.hpp>
 
 #include <iterator>
@@ -126 +128 @@
     
     /**
-       Conversion from mutable iterator to const iterator. Only works
-       if underlying iterator is a pointer.
-     */
-    // Peter, this is ugly hack to provide iterator to const_iterator
-    // for our gsl_iterators - solution? use Boost:iterator_adaptor
-    operator StrideIterator<const value_type*>()
-    { return StrideIterator<const value_type*>(base(), stride_); }
+       \brief Conversion constructor. 
+
+       Create a StrideIterator<Iter> from a StrideIterator<I2>. Possible
+       if I2 is convertible to a Iter. Constructor allows implicit
+       conversions such as iterator to const_iterator.
+     */
+    template<typename I2>
+    StrideIterator(StrideIterator<I2> other,
+                   typename boost::enable_if_convertible<I2, Iter>::type* = 0 )
+      : iterator_(other.base()), stride_(other.stride()) {}
 
     /**