Changeset 1246

Timestamp:

Mar 17, 2008, 1:58:43 PM (16 years ago)

Author:

Peter

Message:

working in #223

File:

• trunk/test/roc_test.cc (modified) (6 diffs)

trunk/test/roc_test.cc

@@ -22 +22 @@
 */
 
+#include "Suite.h"
+
 #include "yat/classifier/DataLookupWeighted1D.h"
 #include "yat/classifier/Target.h"
@@ -35 +37 @@
 using namespace theplu::yat;
 
-int main(const int argc,const char* argv[])
+int main(int argc, char* argv[])
 {  
-  std::ostream* error;
-  if (argc>1 && argv[1]==std::string("-v"))
-    error = &std::cerr;
-  else {
-    error = new std::ofstream("/dev/null");
-    if (argc>1)
-      std::cout << "roc_test -v : for printing extra information\n";
-  }
-  bool ok = true;
+  test::Suite suite(argc, argv);
 
-  *error << "testing ROC" << std::endl;
+  suite.err() << "testing ROC" << std::endl;
   utility::Vector value(31);
   std::vector<std::string> label(31,"negative");
@@ -58 +52 @@
   add(roc, value.begin(), value.end(), target);
   double area = roc.area();
-  if (area!=0.0){
-    *error << "test_roc: area is " << area << " should be 0.0" 
+  if (!suite.equal(area,0.0)){
+    suite.err() << "test_roc: area is " << area << " should be 0.0" 
            << std::endl;
-    ok = false;
+    suite.add(false);
   }
   target.set_binary(0,false);
@@ -68 +62 @@
   add(roc, value.begin(), value.end(), target);
   area = roc.area();
-  if (area!=1.0){
-    *error << "test_roc: area is " << area << " should be 1.0" 
+  if (!suite.equal(area,1.0)){
+    suite.err() << "test_roc: area is " << area << " should be 1.0" 
            << std::endl;
-    ok = false;
+    suite.add(false);
   }
   
@@ -77 +71 @@
   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 (!(p/p_matlab < 1.01 && p/p_matlab > 0.99)){
+    suite.err() << "get_p_approx: p-value not correct" << std::endl;
+    suite.err() << p << " expected " << p_matlab << std::endl;
+    suite.add(false);
   }
-  if (p2 != 2*p) {
-    ok = false;
-    *error << "Two-sided P-value should equal 2 * one-sided P-value.\n";
+  if (!(p2==2*p)) {
+    suite.add(false);
+    suite.err() << "Two-sided P-value should equal 2 * one-sided P-value.\n";
   }
   roc.minimum_size() = 20;
   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 (!( p < 1e-8 && p > 1e-9) ){
+    suite.err() << "get_p_exact: p-value not correct" << std::endl;
+    suite.add(false);
   }
-  if (p2 != 2*p) {
-    ok = false;
-    *error << "Two-sided P-value should equal 2 * one-sided P-value.\n";
+  if (!( p2==2*p)) {
+    suite.add(false);
+    suite.err() << "Two-sided P-value should equal 2 * one-sided P-value.\n";
   }
   
@@ -101 +95 @@
   add(roc, dlw.begin(), dlw.end(), target);
 
-  if (ok)
-    return 0;
-  return -1;
+  return suite.return_value();
 }