Changeset 3522

Timestamp:

Oct 10, 2016, 9:32:16 AM (7 years ago)

Author:

Peter

Message:

refs #803. In Histogram no need to require forrward iterator but allow all data iterator as long as they are single_pass_iterator.

File:

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

trunk/yat/statistics/Histogram.h

@@ -32 +32 @@
 
 #include <boost/concept_check.hpp>
+#include <boost/iterator/iterator_concepts.hpp>
 
 #include <iosfwd>
@@ -230 +231 @@
      Add a range [first, last) of values to Histogram.
 
-     ForwardIterator should be a \ref concept_data_iterator
+     Type Requirements:
+     - \c Iterator models a \ref concept_data_iterator
+     - \c Iterator models a \single_pass_iterator
 
      \relates Histogram
    */
-  template<typename ForwardIterator>
-  void add(Histogram& h, 
-           ForwardIterator first, ForwardIterator last)
+  template<typename Iterator>
+  void add(Histogram& h, Iterator first, Iterator last)
   {
-    BOOST_CONCEPT_ASSERT((boost::ForwardIterator<ForwardIterator>));
-    BOOST_CONCEPT_ASSERT((utility::DataIteratorConcept<ForwardIterator>));
-    utility::iterator_traits<ForwardIterator> traits;
+    BOOST_CONCEPT_ASSERT((boost_concepts::SinglePassIterator<Iterator>));
+    BOOST_CONCEPT_ASSERT((utility::DataIteratorConcept<Iterator>));
+    utility::iterator_traits<Iterator> traits;
     while (first!=last) {
       h.add(traits.data(first), traits.weight(first));
@@ -249 +251 @@
   /**
      The Histogram output operator
-     
+
      \relates Histogram
   */