Changeset 1511 for trunk/test/normalization_test.cc

Timestamp:

Sep 19, 2008, 3:18:53 PM (15 years ago)

Author:

Peter

Message:

refs #437 modified test to reflect new spec

File:

• trunk/test/normalization_test.cc (modified) (2 diffs)

trunk/test/normalization_test.cc

@@ -125 +125 @@
   spearman(vec.begin(), vec.end(), vec.begin());
   std::vector<double> correct;
-  correct.push_back(0);
-  correct.push_back(0.5);
-  correct.push_back(0.75);
-  correct.push_back(0.25);
-  suite.equal_range(vec.begin(), vec.end(), correct.begin());
+  correct.push_back(1.0/8);
+  correct.push_back(5.0/8);
+  correct.push_back(7.0/8);
+  correct.push_back(3.0/8);
+  suite.xadd(suite.equal_range(vec.begin(), vec.end(), correct.begin()));
+  suite.err() << "Testing Spearman with ties\n";
+  vec[1]=vec[2];
+  correct[1] = correct[2] = (correct[1]+correct[2])/2;
+  suite.xadd(suite.equal_range(vec.begin(), vec.end(), correct.begin()));
   test_spearman_weighted(suite);
 }
@@ -181 +185 @@
   m(0,1).weight() = 0.0;
   spearman(m.begin_row(0), m.end_row(0), res.begin_row(0));
-  suite.add(suite.equal(res(0,0).data(), 0)); 
-  suite.add(suite.equal(res(0,2).data(), 2.0/3)); 
-  suite.add(suite.equal(res(0,3).data(), 1.0/3)); 
+  suite.xadd(suite.equal(res(0,0).data(), 0.5/3)); 
+  suite.xadd(suite.equal(res(0,2).data(), 2.5/3)); 
+  suite.xadd(suite.equal(res(0,3).data(), 1.5/3)); 
 }