Changeset 4103

Timestamp:

Sep 22, 2021, 10:25:08 AM (2 years ago)

Author:

Peter

Message:

closes #710

Location:

branches/0.19-stable

Files:

• test/Makefile.am (modified) (1 diff)
• test/kendall.cc (modified) (1 diff)
• yat/statistics/Kendall.cc (modified) (3 diffs)

branches/0.19-stable/test/Makefile.am

@@ -142 +142 @@
 
 # tests not passing through yet
-XFAIL_TESTS = test/kendall.test
+XFAIL_TESTS =
 
 DISTRIBUTED_TESTS = \

branches/0.19-stable/test/kendall.cc

@@ -171 +171 @@
   double p = kendall.p_value();
   suite.out() << "p: " << p << "\n";
-  if (p > 0.0001) {
-    suite.err() << "error: too large p\n";
-    suite.add(false);
-  }
-  if (p < 0.00001) {
-    suite.err() << "error: too small p\n";
+  if (p < 0.00001 || p > 0.0001) {
+    suite.err() << "error: p not within [0.00001, 0.0001]\n";
     suite.add(false);
   }

branches/0.19-stable/yat/statistics/Kendall.cc

@@ -41 +41 @@
 #include <vector>
 
-
-#include <iostream> // debug
 namespace theplu {
 namespace yat {
@@ -264 +262 @@
                    x_ties_);
 
+    std::vector<double> vec(utility::pair_second_iterator(data.begin()),
+                            utility::pair_second_iterator(data.end()));
+    std::sort(vec.begin(), vec.end());
+    calculate_ties(vec.begin(), vec.end(), y_ties_);
+
     /*
                 y1 < y2  y2 == y2  y2 > y2
@@ -390 +393 @@
       v2 = sum t(t-1)(t-2) \sum u(u-1)(u-2) / (9n(n-1)(n-2))
 
-      where t is number of equal values in group i and similarly u for
+      where t is number of equal x values in group i and similarly u for
       y.
     */