Changeset 1771

Timestamp:

Feb 4, 2009, 6:27:27 PM (13 years ago)

Author:

Peter

Message:

rescaling index - refs #478

File:

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

trunk/yat/normalizer/qQuantileNormalizer.h

@@ -156 +156 @@
 
 
+    size_t N_target_;
     Partitioner target_;
 
@@ -179 +180 @@
                                            BidirectionalIterator last,
                                            unsigned int Q)
-    : target_(Partitioner(first, last, Q))
+    : N_target_(std::distance(first, last)), 
+      target_(Partitioner(first, last, Q))
   {
     utility::yat_assert<std::runtime_error>(Q>2, 
@@ -216 +218 @@
     utility::Vector diff(source.averages());
     diff-=target_.averages();
-    const utility::Vector& idx=target_.index();
+    utility::Vector idx=target_.index();
+    // if N_target_ is different from N_source_ we need to rescale the
+    // idx so they stretch over same range
+    idx *= static_cast<double>(N)/static_cast<double>(N_target_);
+
     regression::CSplineInterpolation cspline(idx,diff);