Changeset 2282

Timestamp:

Jun 26, 2010, 3:38:17 AM (11 years ago)

Author:

Peter

Message:

document and test that DataIterator? and WeightIterator? works with/requires input_iterator. closes #633

Location:

trunk

Files:

• test/iterator_test.cc (modified) (4 diffs)
• yat/utility/DataIterator.h (modified) (4 diffs)
• yat/utility/WeightIterator.h (modified) (4 diffs)

trunk/test/iterator_test.cc

@@ -66 +66 @@
 
 void test_data_iterator(test::Suite& suite);
+void test_weight_iterator(test::Suite& suite);
 void test_iterator_traits(test::Suite& suite);
 void test_stride_iterator(test::Suite& suite);
@@ -87 +88 @@
   test_weighted_iterator(suite);
   test_data_iterator(suite);
+  test_weight_iterator(suite);
   return suite.return_value();
 }
@@ -311 +313 @@
             data_iterator(forward_it));
 
-#ifdef YAT_TICKET_633
-  input_iterator_archetype<utility::DataWeight> input_it_w;
+  boost::input_iterator_archetype_no_proxy<utility::DataWeight> input_it_w;
   mutable_forward_iterator_archetype<utility::DataWeight> forward_it_w;
   std::copy(data_iterator(input_it_w),
             data_iterator(input_it_w),
             data_iterator(forward_it_w));
-#endif
+
+}
+
+
+void test_weight_iterator(test::Suite& suite)
+{
+  // do not run compile test
+  return;
+
+  using utility::WeightIterator;
+  using boost::input_iterator_archetype;
+  input_iterator_archetype<double> input_it;
+  using boost::mutable_forward_iterator_archetype;
+  
+  // we are using weighted here because unweighted WeightIterator is
+  // always const (not mutable)
+  mutable_forward_iterator_archetype<utility::DataWeight> forward_it_w;
+
+  using utility::weight_iterator;
+  std::copy(weight_iterator(input_it),
+            weight_iterator(input_it),
+            weight_iterator(forward_it_w));
+
+  boost::input_iterator_archetype_no_proxy<utility::DataWeight> input_it_w;
+  std::copy(weight_iterator(input_it_w),
+            weight_iterator(input_it_w),
+            weight_iterator(forward_it_w));
 }
 
@@ -347 +374 @@
   w = traits2.weight(&dwp);
   delete trivial_iter;
+
+  // do not run compile test
+  return;
+  using utility::DataWeight;
+  using utility::iterator_traits;
+  // iterator_traits does not work with a proxy that lacks member
+  // function data() so we test with no_proxy archetype instead.
+  typedef boost::input_iterator_archetype_no_proxy<DataWeight> input; 
+  utility::iterator_traits<input> traits3;
+  w = traits3.weight(input());
+  typedef boost::output_iterator_archetype<DataWeight> output;  
+  utility::iterator_traits<output> traits4;
+  w = traits4.weight(boost::detail::dummy_constructor());
 }
 

trunk/yat/utility/DataIterator.h

@@ -26 +26 @@
 #include "iterator_traits.h"
 
+#include <boost/concept_check.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
 #include <boost/type_traits/remove_reference.hpp>
@@ -54 +55 @@
 
      \endcode
+
+    Type Requirement: \c BASE must be an \input_iterator
   */
   template<typename Base>
@@ -71 +74 @@
      */
     explicit DataIterator(Base b)
-      : DataIterator::iterator_adaptor_(b) {}
+      : DataIterator::iterator_adaptor_(b) 
+    {
+      BOOST_CONCEPT_ASSERT((boost::InputIterator<Base>));
+    }
 
     /**
@@ -79 +85 @@
      */
     DataIterator(void)
-      : DataIterator::iterator_adaptor_() {}
+      : DataIterator::iterator_adaptor_()
+    {
+      BOOST_CONCEPT_ASSERT((boost::InputIterator<Base>));
+    }
 
     /**

trunk/yat/utility/WeightIterator.h

@@ -24 +24 @@
 */
 
+#include "iterator_traits.h"
+
+#include <boost/concept_check.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
 #include <boost/type_traits/remove_reference.hpp>
@@ -52 +55 @@
 
      \endcode
+
+    Type Requirement: \c BASE must be an \input_iterator
   */
   template<typename Base>
@@ -71 +76 @@
      */
     WeightIterator(void)
-      : WeightIterator::iterator_adaptor_() {}
+      : WeightIterator::iterator_adaptor_() 
+    {
+      BOOST_CONCEPT_ASSERT((boost::InputIterator<Base>));
+    }
 
     /**
@@ -77 +85 @@
      */
     explicit WeightIterator(Base b)
-      : WeightIterator::iterator_adaptor_(b) {}
+      : WeightIterator::iterator_adaptor_(b)
+    {
+      BOOST_CONCEPT_ASSERT((boost::InputIterator<Base>));
+    }
 
     /**