Changeset 2149

Timestamp:

Jan 17, 2010, 4:28:14 AM (12 years ago)

Author:

Peter

Message:

fixes #543

Location:

trunk

Files:

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

trunk/test/normalization_test.cc

@@ -400 +400 @@
   suite.add(suite.equal(res(0,2).data(), 2.0/3)); 
   suite.add(suite.equal(res(0,3).data(), 0.5/3)); 
+  // compile test should not be run
+  if (false) {
+    spearman(boost::random_access_iterator_archetype<double>(), 
+             boost::random_access_iterator_archetype<double>(),
+             boost::mutable_random_access_iterator_archetype<double>());
+  }
+
 }
 

trunk/yat/normalizer/Spearman.h

@@ -29 +29 @@
 #include "yat/utility/WeightIterator.h"
 
+#include <boost/concept_check.hpp>
+
 #include <algorithm>
 #include <functional>
@@ -58 +60 @@
        permissible for the iterators \a first and \a result to be the
        same.
+
+       Type Requirements:
+       - RandomAccessIter1 must be a \random_access_iterator
+       - RandomAccessIter2 must be a mutable \random_access_iterator
+
      */
-    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
     {
-      typename utility::weighted_iterator_traits<ForwardIterator>::type tag;
+      using boost::function_requires;
+      function_requires<boost::RandomAccessIterator<RandomAccessIter1> >();
+      function_requires<boost::Mutable_RandomAccessIterator<RandomAccessIter2> >();
+      typename utility::weighted_iterator_traits<RandomAccessIter1>::type tag;
       normalize(first, last, result, tag);
     }