Changeset 821 for trunk/test

Timestamp:

Mar 18, 2007, 5:00:05 PM (16 years ago)

Author:

Peter

Message:

Modified ROC class to use AUC class in calculation of ROC area. Refs #101

Location:

trunk/test

Files:

• roc_test.cc (modified) (3 diffs)
• score_test.cc (modified) (2 diffs)

trunk/test/roc_test.cc

@@ -55 +55 @@
     value(i)=i;
   statistics::ROC roc;
-  double area = roc.score(target, value);
+  for (size_t i=0; i<value.size(); ++i){
+    roc.add(value(i), target.binary(i));
+  }
+  double area = roc.area();
   if (area!=0.0){
     *error << "test_roc: area is " << area << " should be 0.0" 
@@ -63 +66 @@
   target.set_binary(0,false);
   target.set_binary(1,true);
-  area = roc.score(target, value);
+  roc.reset();
+  for (size_t i=0; i<value.size(); ++i)
+    roc.add(value(i), target.binary(i));
+  area = roc.area();
   if (area!=1.0){
     *error << "test_roc: area is " << area << " should be 1.0" 
@@ -70 +76 @@
   }
   
-  double p = roc.p_value();
+  double p = roc.p_value_one_sided();
+  double p2 = roc.p_value();
   double p_matlab = 0.00000115;
   if (p/p_matlab > 1.01 | p/p_matlab < 0.99){
     *error << "get_p_approx: p-value not correct" << std::endl;
+    *error << p << " expected " << p_matlab << std::endl;
     ok = false;
   }
+  if (p2 != 2*p) {
+    ok = false;
+    *error << "Two-sided P-value should equal 2 * one-sided P-value.\n";
+  }
   roc.minimum_size() = 20;
-  p = roc.p_value();
+  p = roc.p_value_one_sided();
+  p2 = roc.p_value();
   if (p > pow(10, -8.0) | p < pow(10, -9.0)){
     *error << "get_p_exact: p-value not correct" << std::endl;
     ok = false;
+  }
+  if (p2 != 2*p) {
+    ok = false;
+    *error << "Two-sided P-value should equal 2 * one-sided P-value.\n";
   }
   

trunk/test/score_test.cc

@@ -60 +60 @@
   for (size_t i=0; i<value.size(); i++) 
     value(i)=i;
-  statistics::AUC auc;
+  statistics::AUC auc(false);
   double area = auc.score(target, value);
-  if (area!=1.0){
-    *error << "test_auc: area is " << area << " should be 1.0" 
+  if (area!=0.0){
+    *error << "test_auc: area is " << area << " should be 0.0" 
            << std::endl;
     ok = false;
@@ -85 +85 @@
   
   utility::vector correct_area(3);
-  correct_area(0)=8.0/9.0;
-  correct_area(1)=6.0/9.0;
-  correct_area(2)=1.0;
+  correct_area(0)=1.0/9.0;
+  correct_area(1)=3.0/9.0;
+  correct_area(2)=0.0;
 
   const double tol = 0.001;