Changeset 1420 for trunk/test/statistics_test.cc

Timestamp:

Aug 20, 2008, 7:33:39 PM (15 years ago)

Author:

Peter

Message:

fixing the weighted implementation of Percentiler - refs #366. Some documentation is needed before closing the ticket.

File:

• trunk/test/statistics_test.cc (modified) (3 diffs)

trunk/test/statistics_test.cc

@@ -97 +97 @@
   x.reserve(6);
   for (unsigned int i=0; i<5; i++){
-    x.push_back(static_cast<double>(i));
+    x.push_back(static_cast<double>(i+1));
   }
-  test_percentiler(suite, x.begin(), x.end(), 50, 2);
-  x.push_back(5);
-  test_percentiler(suite, x.begin(), x.end(), 50, 2.5);
-  test_percentiler(suite, x.begin(), x.end(), 25, 1);
-  test_percentiler(suite, x.begin(), x.end(), 0, 0);
-  test_percentiler(suite, x.begin(), x.end(), 10, 0);
+  test_percentiler(suite, x.begin(), x.end(), 50, 3);
+  x.push_back(6);
+  test_percentiler(suite, x.begin(), x.end(), 50, 3.5);
+  test_percentiler(suite, x.begin(), x.end(), 25, 2);
+  test_percentiler(suite, x.begin(), x.end(), 0, 1);
+  test_percentiler(suite, x.begin(), x.end(), 10, 1);
 
   suite.err() << "testing duplication of data\n";
@@ -122 +122 @@
   }
   const std::vector<utility::DataWeight> xw_orig(xw);
+  suite.err() << "testing weighted" << std::endl;
+  test_percentiler(suite, xw.begin(), xw.end(), 0, 1);
+  test_percentiler(suite, xw.begin(), xw.end(), 100, 6);
+  test_percentiler(suite, xw.begin(), xw.end(), 49, 3);
+  test_percentiler(suite, xw.begin(), xw.end(), 51, 4);
+  test_percentiler(suite, xw.begin(), xw.end(), 50, 3.5);
+  test_percentiler(suite, x.begin(), x.end(), 10, 1);
+
   suite.err() << "testing weighted with unity weights" << std::endl;
   cmp_percentiler(suite, x.begin(), x.end(), xw.begin(), xw.end());
@@ -149 +157 @@
   double x = percentile2(first, last, p);
   if (!suite.add(suite.equal(x, correct, 10))) {
-    suite.err() << "Error in percentile2\n";
+    suite.err() << "Error in percentile2 for " << p << "th percentile \n";
     suite.err() << "  calculated value: " << x << "\n";
     suite.err() << "  expected value: " << correct << "\n";