Changeset 3529

Timestamp:

Oct 11, 2016, 9:50:26 AM (7 years ago)

Author:

Peter

Message:

refs #803. use new iterator concept in AveragerPair?

File:

• trunk/yat/statistics/AveragerPair.h (modified) (5 diffs)

trunk/yat/statistics/AveragerPair.h

@@ -31 +31 @@
 
 #include <boost/concept_check.hpp>
+#include <boost/iterator/iterator_concepts.hpp>
 
 #include <cmath>
@@ -67 +68 @@
 
        \f$ \frac{\sum_i (x_i-m_x)(y_i-m_y)}{\sum_i
-       (x_i-m_x)^2+\sum_i (y_i-m_y)^2 + n(m_x-m_y)^2} \f$ 
-       
+       (x_i-m_x)^2+\sum_i (y_i-m_y)^2 + n(m_x-m_y)^2} \f$
+
     */
     double ccc(void) const;
@@ -74 +75 @@
     /**
        \f$ \frac{\sum_i (x_i-m_x)(y_i-m_y)}{\sqrt{\sum_i
-       (x_i-m_x)^2\sum_i (y_i-m_y)^2}} \f$ 
-       
+       (x_i-m_x)^2\sum_i (y_i-m_y)^2}} \f$
+
        \return %Pearson correlation coefficient.
     */
     double correlation(void) const;
-  
+
     ///
     /// Calculating covariance using
@@ -88 +89 @@
     ///
     double covariance(void) const;
-  
+
     ///
     /// @return The mean of xy.
@@ -157 +158 @@
      \brief adding data from two ranges to AveragerPair \a ap
 
+     Type Requirements:
+     - \c InputIterator1 is \readable_iterator
+     - \c InputIterator1 is unweighted
+     - \c InputIterator1 is \single_pass_iterator
+     - \c InputIterator2 is \readable_iterator
+     - \c InputIterator2 is unweighted
+     - \c InputIterator2 is \single_pass_iterator
+
      \relates AveragerPair
    */
   template <class InputIterator1, class InputIterator2>
-  void add(AveragerPair& ap, InputIterator1 first1, InputIterator1 last1, 
+  void add(AveragerPair& ap, InputIterator1 first1, InputIterator1 last1,
            InputIterator2 first2)
   {
-    BOOST_CONCEPT_ASSERT((boost::InputIterator<InputIterator1>));
-    BOOST_CONCEPT_ASSERT((boost::InputIterator<InputIterator2>));
+    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>));
+
     utility::check_iterator_is_unweighted(first1);
     utility::check_iterator_is_unweighted(first2);