Changeset 1926

Timestamp:

Apr 30, 2009, 4:02:14 PM (12 years ago)

Author:

Peter

Message:

Ignoring zero weights in Percentiler so algorithm works also when {value=nan, weight=0}

Location:

branches/0.5-stable

Files:

• test/statistics_test.cc (modified) (5 diffs)
• yat/statistics/Percentiler.h (modified) (2 diffs)

branches/0.5-stable/test/statistics_test.cc

@@ -6 +6 @@
   Copyright (C) 2006 Jari Häkkinen, Peter Johansson, Markus Ringnér
   Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2009 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -33 +34 @@
 #include <cstdlib>
 #include <iostream>
+#include <limits>
 #include <map>
 #include <vector>
@@ -38 +40 @@
 using namespace theplu::yat;
 void test_percentiler(test::Suite&);
+void test_percentiler_nan(test::Suite&);
 
 template<typename RandomAccessIterator>
@@ -71 +74 @@
   // testing percentile2
   test_percentiler(suite);
+
+  // test weighted percentiler with NaNs
+  test_percentiler_nan(suite);
 
   double skewness_gsl=statistics::skewness(gsl_vec);
@@ -144 +150 @@
 }
 
+void test_percentiler_nan(test::Suite& suite)
+{
+  using utility::DataWeight;
+  std::vector<double> v;
+  v.push_back(1);
+  v.push_back(10);
+  v.push_back(4);
+  v.push_back(2);
+  std::vector<DataWeight> wv(5);
+  wv[0] = DataWeight(v[0]);
+  wv[1] = DataWeight(v[1]);
+  wv[2] = DataWeight(std::numeric_limits<double>::quiet_NaN(), 0.0);
+  wv[3] = DataWeight(v[2]);
+  wv[4] = DataWeight(v[3]);
+
+  cmp_percentiler(suite, v.begin(), v.end(), wv.begin(), wv.end());
+}
+
 template<typename RandomAccessIterator>
 void test_percentiler(test::Suite& suite, 

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

@@ -6 +6 @@
 /*
   Copyright (C) 2008 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2009 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -184 +185 @@
     std::vector<utility::DataWeight> v_copy;
     v_copy.reserve(last-first);
-    std::copy(first, last, std::back_inserter(v_copy));
+    utility::iterator_traits<RandomAccessIterator> traits;
+    for ( ; first!=last; ++first)
+      if (traits.weight(first)) // ignore zero weights
+        v_copy.push_back(*first);
     std::sort(v_copy.begin(), v_copy.end());
     return calculate(v_copy.begin(), v_copy.end(), true, tag);