Changeset 779 for trunk/test/score_test.cc

Timestamp:

Mar 5, 2007, 7:58:30 PM (16 years ago)

Author:

Peter

Message:

Refs #101

File:

• trunk/test/score_test.cc (modified) (5 diffs)

trunk/test/score_test.cc

@@ -25 +25 @@
 #include "yat/statistics/FoldChange.h"
 #include "yat/statistics/Pearson.h"
-#include "yat/statistics/ROC.h"
-#include "yat/statistics/SAM.h"
+#include "yat/statistics/ROCscore.h"
+#include "yat/statistics/SAMScore.h"
 #include "yat/statistics/tScore.h"
 #include "yat/statistics/WilcoxonFoldChange.h"
@@ -52 +52 @@
   bool ok = true;
 
-  *error << "testing ROC" << std::endl;
+  *error << "testing ROCscore" << std::endl;
   utility::vector value(31);
   std::vector<std::string> label(31,"negative");
@@ -60 +60 @@
   for (size_t i=0; i<value.size(); i++) 
     value(i)=i;
-  statistics::ROC roc;
+  statistics::ROCscore roc;
   double area = roc.score(target, value);
   if (area!=1.0){
@@ -73 +73 @@
     *error << "test_roc: area is " << area << " should be 1.0" 
            << std::endl;
-    ok = false;
-  }
-  
-  double p = 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;
-    ok = false;
-  }
-  roc.minimum_size() = 20;
-  p = 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;
   }
@@ -141 +128 @@
   statistics::WilcoxonFoldChange wfc(true);
 
-  *error << "testing SAM" << std::endl;
-  statistics::SAM sam(1.0,true);
+  *error << "testing SAMScore" << std::endl;
+  statistics::SAMScore sam(1.0,true);