Changeset 2159

Timestamp:

Jan 20, 2010, 12:48:24 AM (13 years ago)

Author:

Peter

Message:

fixes #586 and refs #587
extend test of Averager and AveragerWeighted?. Document requirement in iterators.

weighted_iterator_traits<T>::type now returns weighted if T is
convertible to DataWeight? (refs #604).

Location:

trunk

Files:

• test/averager_test.cc (modified) (2 diffs)
• test/iterator_test.cc (modified) (2 diffs)
• yat/statistics/Averager.h (modified) (2 diffs)
• yat/statistics/AveragerWeighted.h (modified) (1 diff)
• yat/utility/iterator_traits.h (modified) (4 diffs)

trunk/test/averager_test.cc

@@ -30 +30 @@
 #include "yat/statistics/AveragerWeighted.h"
 #include "yat/utility/Vector.h"
+
+#include <boost/concept_archetype.hpp>
 
 #include <cmath>
@@ -359 +361 @@
     suite.err() << "error for x_averager():\t" << std::endl;
   }
+
+  // compile tests should not be run
+  if (false) {
+    Averager averager;
+    add(averager, boost::input_iterator_archetype<double>(),
+        boost::input_iterator_archetype<double>());
+    AveragerWeighted averagerw;
+    using utility::DataWeight;
+    typedef boost::input_iterator_archetype<DataWeight> Iter;
+    Iter iter;
+    utility::iterator_traits<Iter> traits;
+    //traits.weight(iter);
+    //    add(averagerw, boost::input_iterator_archetype<DataWeight>(),
+    //  boost::input_iterator_archetype<DataWeight>());
+  }
+
   return ok;
 }

trunk/test/iterator_test.cc

@@ -30 +30 @@
 #include "yat/utility/Container2DIterator.h"
 #include "yat/utility/DataWeight.h"
+#include "yat/utility/DataWeightProxy.h"
 #include "yat/utility/DataIterator.h"
 #include "yat/utility/Matrix.h"
@@ -297 +298 @@
   double w = traits.weight(vec.begin());
   suite.add(suite.equal(w, 1.0));
+  utility::iterator_traits<utility::DataWeight*>().weight(&vec[0]);
+
+  double* trivial_iter = new double(1.0);
+  utility::DataWeightProxy<double*, double*> dwp(trivial_iter,trivial_iter); 
+  typedef utility::DataWeightProxy<double*, double*> Proxy;
+  //utility::iterator_traits<Proxy*> traits2;
+  //traits2.weight(&dwp);
+  delete trivial_iter;
 }
 

trunk/yat/statistics/Averager.h

@@ -27 +27 @@
 
 #include "yat/utility/iterator_traits.h"
+
+#include <boost/concept_check.hpp>
 
 #include <cmath>
@@ -186 +188 @@
      \relates Averager
    */
-  template <typename Iter>
-  void add(Averager& a, Iter first, Iter last)
+  template <typename InputIterator>
+  void add(Averager& a, InputIterator first, InputIterator last)
   {
+    BOOST_CONCEPT_ASSERT((boost::InputIterator<InputIterator>));
     utility::check_iterator_is_unweighted(first);
     for ( ; first != last; ++first)

trunk/yat/statistics/AveragerWeighted.h

@@ -216 +216 @@
      \relates AveragerWeighted
    */
-  template <typename Iter>
-  void add(AveragerWeighted& a, Iter first, Iter last)
+  template <typename InputIter>
+  void add(AveragerWeighted& a, InputIter first, InputIter last)
   {
+    utility::iterator_traits<InputIter> traits;
     for ( ; first != last; ++first)
-      a.add(utility::iterator_traits<Iter>().data(first),
-            utility::iterator_traits<Iter>().weight(first));
+      a.add(traits.data(first), traits.weight(first));
   }
 

trunk/yat/utility/iterator_traits.h

@@ -25 +25 @@
 
 #include "DataWeight.h"
+
+#include <boost/type_traits/is_convertible.hpp>
+#include <boost/utility/enable_if.hpp>
 
 #include <iterator>
@@ -53 +56 @@
      used in weighted_iterator_traits
   */
-  template <typename T>
+  template <typename T, typename Enable = void>
   struct weighted_iterator_traits_detail {
     /**
@@ -66 +69 @@
       specialization for iterators with value type DataWeight
   */
-  template <>
-  struct weighted_iterator_traits_detail<DataWeight> {
+  template <typename T>
+  struct weighted_iterator_traits_detail<T, typename boost::enable_if<typename boost::is_convertible<T, DataWeight>::type>::type > {
     /**
        Iterators with value type DataWeight is weighted
@@ -73 +76 @@
     typedef weighted_iterator_tag type;
   };  
+
 } // namespace detail