Changeset 2466

Timestamp:

Apr 12, 2011, 2:10:59 AM (12 years ago)

Author:

Peter

Message:

Fixed so percentiler ignores element with zero weight

Location:

branches/0.7-stable

Files:

• test/statistics.cc (modified) (1 diff)
• yat/statistics/Percentiler.h (modified) (1 diff)

branches/0.7-stable/test/statistics.cc

@@ -271 +271 @@
                      RandomAccessIterator2 last2)
 {
-  for (double p=0; p<100; p+=10) {
+  for (double p=0; p<=100; p+=10) {
     double correct=statistics::percentile2(first1, last1, p);
     test_percentiler(suite, first2, last2, p, correct);

branches/0.7-stable/yat/statistics/Percentiler.h

@@ -181 +181 @@
       while (upper!=accum_w.end() && *upper <= w_bound+margin)
         ++upper;
-      if (upper==accum_w.end())
+      while (upper!=accum_w.begin() &&
+             (upper==accum_w.end() || 
+              trait.weight(first+(upper-accum_w.begin()))==0.0))
         --upper;
       std::vector<double>::const_iterator lower(upper);