Changeset 3527

Timestamp:

Oct 11, 2016, 9:06:08 AM (7 years ago)

Author:

Peter

Message:

refs #803. use new iterator concept in Averager

File:

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

trunk/yat/statistics/Averager.h

@@ -31 +31 @@
 
 #include <boost/concept_check.hpp>
+#include <boost/iterator/iterator_concepts.hpp>
 
 #include <cmath>
@@ -86 +87 @@
      \brief adding a range of values to Averager \a a
 
+     Type Requirements:
+     - \c InputIterator is a \readable_iterator
+     - \c InputIterator is \single_pass_iterator
+     - \c InputIterator 's value type is convertible to \c double
+
      \relates Averager
    */
@@ -91 +97 @@
   void add(Averager& a, InputIterator first, InputIterator last)
   {
-    BOOST_CONCEPT_ASSERT((boost::InputIterator<InputIterator>));
+    BOOST_CONCEPT_ASSERT((boost_concepts::ReadableIterator<InputIterator>));
+    BOOST_CONCEPT_ASSERT((boost_concepts::SinglePassIterator<InputIterator>));
+    typedef typename boost::iterator_value<InputIterator>::type T;
+    BOOST_CONCEPT_ASSERT((boost::Convertible<T, double>));
     utility::check_iterator_is_unweighted(first);
     for ( ; first != last; ++first)