Changeset 1377

Timestamp:

Jul 16, 2008, 10:09:06 PM (13 years ago)

Author:

Peter

Message:

allow conversion in DataIterator? and WeightIterator?

Location:

trunk

Files:

• test/iterator_test.cc (modified) (1 diff)
• yat/utility/DataIterator.h (modified) (1 diff)
• yat/utility/WeightIterator.h (modified) (1 diff)

trunk/test/iterator_test.cc

@@ -106 +106 @@
   suite.add(*data_iter3 == 1.0);
 
+  // testing constness conversion
+  std::vector<double>::const_iterator c_iter(stl_vec.begin());
+  std::vector<double>::iterator iter(stl_vec.begin());
+  suite.add(iter==c_iter);
+  utility::DataIterator<std::vector<double>::const_iterator>  
+    data_iter4(c_iter);
+  utility::DataIterator<std::vector<double>::iterator>  
+    data_iter5(iter);
+  suite.add(data_iter2 == data_iter5);
+  suite.add(data_iter4 == data_iter5);
+
   classifier::MatrixLookup ml(m);
   classifier::DataLookup1D dl1(ml,0,true);

trunk/yat/utility/DataIterator.h

@@ -56 +56 @@
 
     /**
+       \brief Conversion constructor. 
+
+       Create a DataIterator<Base> from a DataIterator<B2>. Possible
+       if B2 is convertible to a Base. Constructor allows implicit
+       conversions such as iterator to const_iterator.
+     */
+    template<typename B2>
+    DataIterator(DataIterator<B2> other,
+                 typename boost::enable_if_convertible<B2, Base>::type* = 0 )
+      : DataIterator::iterator_adaptor_(other.base()) {}
+
+    /**
        using iterator_traits::data on Base iterator
 

trunk/yat/utility/WeightIterator.h

@@ -54 +54 @@
 
     /**
+       \brief Conversion constructor. 
+
+       Create a WeightIterator<Base> from a
+       WeightIterator<B2>. Possible if B2 is convertible to a
+       Base. Constructor allows implicit conversions such as iterator
+       to const_iterator.
+     */
+    template<typename B2>
+    WeightIterator(WeightIterator<B2> other,
+                   typename boost::enable_if_convertible<B2, Base>::type* = 0 )
+      : WeightIterator::iterator_adaptor_(other.base()) {}
+
+    /**
        using iterator_traits::data on Base iterator