Changeset 1617

Timestamp:

Nov 6, 2008, 2:28:02 PM (14 years ago)

Author:

Peter

Message:

refs #457 - adding a test with two samples and avoid shadowing variables

Location:

trunk

Files:

• test/kolmogorov_smirnov_test.cc (modified) (4 diffs)
• yat/statistics/KolmogorovSmirnov.cc (modified) (1 diff)

trunk/test/kolmogorov_smirnov_test.cc

@@ -24 +24 @@
 #include "yat/statistics/Averager.h"
 #include "yat/statistics/KolmogorovSmirnov.h"
+#include "yat/random/random.h"
 
 #include <cmath>
@@ -31 +32 @@
 
 void test_one_sample(test::Suite&);
+void test_two_sample(test::Suite&);
 void test_p_value(test::Suite&);
 void test_reset(test::Suite&);
@@ -39 +41 @@
 
   test_one_sample(suite);
+  test_two_sample(suite);
   //test_p_value(suite);
   test_reset(suite);
@@ -84 +87 @@
 }
 
+
+void test_two_sample(test::Suite& suite)
+{
+  suite.err() << "testing two sample\n";
+  statistics::KolmogorovSmirnov ks;
+  for (size_t i=0; i<5; ++i)
+    ks.add(i+0.5, i<2);
+  suite.add(suite.equal(ks.score(), 1.0));
+  size_t n=1000;
+  double p = ks.p_value(n);
+  double p_correct = 0.2;
+  double margin=10*std::sqrt(n*p_correct)/n;
+  if (std::abs(p-p_correct)>margin) {
+    suite.add(false);
+    suite.err() << "Error: p = " << p << "\n"
+                << "correct p would be: " << p_correct << "\n"
+                << "expected a difference less than " << margin << "margin\n";
+    suite.err() << p << std::endl;
+  }
+}
+
+
 void test_p_value(test::Suite& suite)
 {

trunk/yat/statistics/KolmogorovSmirnov.cc

@@ -89 +89 @@
       std::deque<bool>::const_iterator target_i(targets.begin());
       const_iter end(data_.end());
-      for (const_iter i(data_.begin()); i!=end; ++i, ++target_i) 
-        ks.add(i->first.first, *target_i, i->first.second);
+      for (const_iter iter(data_.begin()); iter!=end; ++iter, ++target_i) 
+        ks.add(iter->first.first, *target_i, iter->first.second);
       
       if (ks.score()>=score())