Changeset 3530

Timestamp:

Oct 11, 2016, 9:57:10 AM (7 years ago)

Author:

Peter

Message:

refs #803. use new iterator concept in AveragerPairWeighted?

File:

• trunk/yat/statistics/AveragerPairWeighted.h (modified) (3 diffs)

trunk/yat/statistics/AveragerPairWeighted.h

@@ -151 +151 @@
      \brief adding a ranges of values to AveragerPairWeighted \a ap
 
+     Type Requirement:
+     - \c InputIterator1 models \ref concept_data_iterator
+     - \c InputIterator1 is \single_pass_iterator
+     - \c InputIterator2 models \ref concept_data_iterator
+     - \c InputIterator2 is \single_pass_iterator
+
      \relates AveragerPairWeighted
    */
@@ -157 +163 @@
            InputIterator1 last1, InputIterator2 first2)
   {
-    BOOST_CONCEPT_ASSERT((boost::InputIterator<InputIterator1>));
-    BOOST_CONCEPT_ASSERT((boost::InputIterator<InputIterator2>));
+    BOOST_CONCEPT_ASSERT((utility::DataIteratorConcept<InputIterator1>));
+    BOOST_CONCEPT_ASSERT((boost_concepts::SinglePassIterator<InputIterator1>));
+    BOOST_CONCEPT_ASSERT((utility::DataIteratorConcept<InputIterator2>));
+    BOOST_CONCEPT_ASSERT((boost_concepts::SinglePassIterator<InputIterator2>));
+
     utility::iterator_traits<InputIterator1> traits1;
     utility::iterator_traits<InputIterator2> traits2;
@@ -173 +182 @@
      Iterators must be unweighted.
 
+     Type Requirement:
+     - \c InputIterator1 models \single_pass_iterator
+     - \c InputIterator1 models \readable_iterator
+     - \c InputIterator1 is weighted
+     - \c InputIterator2 models \single_pass_iterator
+     - \c InputIterator2 models \readable_iterator
+     - \c InputIterator2 is weighted
+     - \c InputIterator3 models \single_pass_iterator
+     - \c InputIterator3 models \readable_iterator
+     - \c InputIterator3 is weighted
+     - \c InputIterator4 models \single_pass_iterator
+     - \c InputIterator4 models \readable_iterator
+     - \c InputIterator4 is weighted
+
      \relates AveragerPairWeighted
    */
   template <typename InputIterator1, typename InputIterator2
             , typename InputIterator3, typename InputIterator4>
-  void add(AveragerPairWeighted& ap, InputIterator1 x, InputIterator1 xlast, 
+  void add(AveragerPairWeighted& ap, InputIterator1 x, InputIterator1 xlast,
            InputIterator2 y, InputIterator3 wx, InputIterator4 wy)
   {
-    BOOST_CONCEPT_ASSERT((boost::InputIterator<InputIterator1>));
-    BOOST_CONCEPT_ASSERT((boost::InputIterator<InputIterator2>));
-    BOOST_CONCEPT_ASSERT((boost::InputIterator<InputIterator3>));
-    BOOST_CONCEPT_ASSERT((boost::InputIterator<InputIterator4>));
+    BOOST_CONCEPT_ASSERT((boost_concepts::ReadableIterator<InputIterator1>));
+    BOOST_CONCEPT_ASSERT((boost_concepts::SinglePassIterator<InputIterator1>));
+    BOOST_CONCEPT_ASSERT((boost_concepts::ReadableIterator<InputIterator2>));
+    BOOST_CONCEPT_ASSERT((boost_concepts::SinglePassIterator<InputIterator2>));
+    BOOST_CONCEPT_ASSERT((boost_concepts::ReadableIterator<InputIterator3>));
+    BOOST_CONCEPT_ASSERT((boost_concepts::SinglePassIterator<InputIterator3>));
+    BOOST_CONCEPT_ASSERT((boost_concepts::ReadableIterator<InputIterator4>));
+    BOOST_CONCEPT_ASSERT((boost_concepts::SinglePassIterator<InputIterator4>));
+
     utility::check_iterator_is_unweighted(x);
     utility::check_iterator_is_unweighted(y);