Changeset 1709

Timestamp:

Jan 13, 2009, 11:48:07 AM (15 years ago)

Author:

Jari Häkkinen

Message:

Addresses #425. Changed partition function.

Location:

trunk/yat/normalizer

Files:

• qQuantileNormalizer.cc (modified) (3 diffs)
• qQuantileNormalizer.h (modified) (1 diff)

trunk/yat/normalizer/qQuantileNormalizer.cc

@@ -37 +37 @@
   Partitioner::Partitioner(const utility::VectorConstView& vec,
                            unsigned int N)
-    : average_(utility::Vector(N+1)), index_(utility::Vector(N+1))
+    : average_(utility::Vector(N)), index_(utility::Vector(N))
   {
     assert(N>1);
@@ -46 +46 @@
     utility::Vector sortedvec(vec);
     std::sort(sortedvec.begin(),sortedvec.end());
-    for (unsigned int i=0; i<=N; ++i) {
-      unsigned int first = ( i    ? (i-0.5)*range : 0 );
-      unsigned int end   = ( i!=N ? (i+0.5)*range : sortedvec.size() );
+    unsigned int first=0;
+    for (unsigned int i=0; i<N; ++i) {
+      unsigned int end   = ( i==(N-1) ? sortedvec.size() : first+range );
       statistics::Averager av;
       for (unsigned int r=first; r<end; ++r)
         av.add(sortedvec(r));
       average_(i)=av.mean();
-      index_(i)=end;
+      index_(i)= (i+0.5)*range;
+      first=end;
     }
   }
@@ -72 +73 @@
   size_t Partitioner::size(void) const
   {
-    return average_.size()-1;
+    return average_.size();
   }
 

trunk/yat/normalizer/qQuantileNormalizer.h

@@ -53 +53 @@
 
     /**
-       \brief The number of equal sized partitions, i.e., number of
-       internal parts minus 1.
-
-       \note The end partitions are paired together to make part since
-       they are only half size as compared to the other parts.
+       \brief The number of parts.
     */
     size_t size(void) const;