Changeset 2155 for trunk/yat/normalizer/Spearman.h

Timestamp:

Jan 18, 2010, 12:22:10 AM (13 years ago)

Author:

Peter

Message:

Spearman now works with mixed iterators. refs #498

File:

• trunk/yat/normalizer/Spearman.h (modified) (3 diffs)

trunk/yat/normalizer/Spearman.h

@@ -23 +23 @@
   along with yat. If not, see <http://www.gnu.org/licenses/>.
 */
+
+#include "utility.h"
 
 #include "yat/utility/DataIterator.h"
@@ -72 +74 @@
       BOOST_CONCEPT_ASSERT((boost::RandomAccessIterator<RandomAccessIter1>));
       BOOST_CONCEPT_ASSERT((boost::Mutable_RandomAccessIterator<RandomAccessIter2>));
-      typename utility::weighted_iterator_traits<RandomAccessIter1>::type tag;
+      using utility::weighted_if_any2;
+      typename weighted_if_any2<RandomAccessIter1,RandomAccessIter2>::type tag;
       normalize(first, last, result, tag);
     }
@@ -105 +108 @@
                    utility::weighted_iterator_tag) const
     {
-      std::copy(utility::weight_iterator(first), 
-                utility::weight_iterator(last),
-                utility::weight_iterator(result));
+      detail::copy_weight_if_weighted(first, last, result);
       std::vector<double> input_vec;
       input_vec.reserve(last-first);