Changeset 2158

Timestamp:

Jan 18, 2010, 1:33:15 AM (12 years ago)

Author:

Peter

Message:

qQuantileNormalizer now works with mixed iterators. closes #498

Location:

trunk

Files:

• test/normalization_test.cc (modified) (1 diff)
• yat/normalizer/qQuantileNormalizer.h (modified) (3 diffs)

trunk/test/normalization_test.cc

@@ -201 +201 @@
          boost::random_access_iterator_archetype<DataWeight>(),
          boost::mutable_random_access_iterator_archetype<DataWeight>());
+    qqn4(boost::random_access_iterator_archetype<DataWeight>(), 
+         boost::random_access_iterator_archetype<DataWeight>(),
+         boost::mutable_random_access_iterator_archetype<double>());
   }
 }

trunk/yat/normalizer/qQuantileNormalizer.h

@@ -21 +21 @@
   along with yat. If not, see <http://www.gnu.org/licenses/>.
 */
+
+#include "utility.h"
 
 #include "yat/regression/CSplineInterpolation.h"
@@ -241 +243 @@
   {
     Partitioner source(first, last, target_.size());
-    typename utility::weighted_iterator_traits<RandomAccessIterator2>::type tag;
+    typename utility::weighted_if_any2<RandomAccessIterator1, RandomAccessIterator2>::type tag;
     normalize(source, first, last, result, tag);
   }
@@ -318 +320 @@
     BOOST_CONCEPT_ASSERT((boost::Mutable_RandomAccessIterator<RandomAccessIterator2>));
     // copy the weights
-    std::copy(utility::weight_iterator(first), 
-              utility::weight_iterator(last), 
-              utility::weight_iterator(result)); 
+    detail::copy_weight_if_weighted(first, last, result);
 
     double total_w = std::accumulate(utility::weight_iterator(first),