Changeset 2148

Timestamp:

Jan 17, 2010, 4:16:27 AM (14 years ago)

Author:

Peter

Message:

fixes #582 and refs #583

Claify that normalizer::Spearman requires random_access_iterator as
input and Gauss inherits the requirement. Added compile test and
concept check for Gauss.

Location:

trunk

Files:

• test/normalization_test.cc (modified) (1 diff)
• yat/normalizer/Gauss.h (modified) (2 diffs)
• yat/normalizer/Spearman.h (modified) (4 diffs)

trunk/test/normalization_test.cc

@@ -335 +335 @@
   gauss(vec.begin(), vec.end(), vec.begin());
   suite.add(suite.equal(vec.front(), -vec.back()));
-
+  // compile test should not be run
+  if (false) {
+    gauss(boost::random_access_iterator_archetype<double>(), 
+          boost::random_access_iterator_archetype<double>(),
+          boost::mutable_random_access_iterator_archetype<double>());
+  }
 }
 

trunk/yat/normalizer/Gauss.h

@@ -27 +27 @@
 #include "yat/utility/iterator_traits.h"
 
+#include <boost/concept_check.hpp>
+
 #include <gsl/gsl_cdf.h>
+
+#include <iterator>
 
 namespace theplu {
@@ -53 +57 @@
        same.
 
+       Type requirements:
+       - ForwardIterator must be a \forward_iterator and a \ref
+       concept_data_iterator. 
+       - RandomAccessIterator must be a mutable \random_access_iterator
+         and a \ref concept_data_iterator.
+
        \see gsl_cdf_ugaussian_Pinv
      */
-    template<typename ForwardIterator, typename RandomAccessIterator>
-    void operator()(ForwardIterator first, ForwardIterator last,
-                    RandomAccessIterator result) const
+    template<typename RandomAccessIter1, typename RandomAccessIter2>
+    void operator()(RandomAccessIter1 first, RandomAccessIter1 last,
+                    RandomAccessIter2 result) const
     {
+      boost::function_requires<boost::RandomAccessIterator<RandomAccessIter1> >();
+      boost::function_requires<boost::Mutable_RandomAccessIterator<RandomAccessIter2> >();
       Spearman spearman;
       spearman(first, last, result);
-      RandomAccessIterator end = result + distance(first, last);
-      utility::iterator_traits<RandomAccessIterator> trait;
+      RandomAccessIter2 end = result + std::distance(first, last);
+      utility::iterator_traits<RandomAccessIter2> trait;
       while (result != end) {
         trait.data(result) = gsl_cdf_ugaussian_Pinv(trait.data(result));

trunk/yat/normalizer/Spearman.h

@@ -70 +70 @@
   private:
     // unweighted version
-    template<typename ForwardIterator, typename RandomAccessIterator>
-    void normalize(ForwardIterator first, ForwardIterator last,
-                   RandomAccessIterator result, 
+    template<typename RandomAccessIter1, typename RandomAccessIter2>
+    void normalize(RandomAccessIter1 first, RandomAccessIter1 last,
+                   RandomAccessIter2 result, 
                    utility::unweighted_iterator_tag) const
     {
@@ -91 +91 @@
 
     // weighted version
-    template<typename ForwardIterator, typename RandomAccessIterator>
-    void normalize(ForwardIterator first, ForwardIterator last,
-                   RandomAccessIterator result, 
+    template<typename RandomAccessIter1, typename RandomAccessIter2>
+    void normalize(RandomAccessIter1 first, RandomAccessIter1 last,
+                   RandomAccessIter2 result, 
                    utility::weighted_iterator_tag) const
     {
@@ -100 +100 @@
                 utility::weight_iterator(result));
       // set values with w=0 to 0 to avoid problems with NaNs
-      utility::iterator_traits<ForwardIterator> trait;
-      for (ForwardIterator i=first; i!=last; ++i)
+      utility::iterator_traits<RandomAccessIter1> trait;
+      for (RandomAccessIter1 i=first; i!=last; ++i)
         if (trait.weight(i)==0)
           trait.data(i)=0.0;
@@ -108 +108 @@
       utility::sort_index(utility::data_iterator(first), 
                           utility::data_iterator(last), perm);
-      utility::iterator_traits<RandomAccessIterator> rtrait;
+      utility::iterator_traits<RandomAccessIter2> rtrait;
 
       double sum_w=0;