Changeset 822 for trunk/test

Timestamp:

Mar 19, 2007, 12:44:09 AM (16 years ago)

Author:

Peter

Message:

redesigned tTest fixes #212 and #156

Location:

trunk/test

Files:

• Makefile.am (modified) (3 diffs)
• roc_test.cc (modified) (4 diffs)
• ttest_test.cc (added)

trunk/test/Makefile.am

@@ -35 +35 @@
   score_test      \
   statistics_test subset_generator_test svd_test svm_test target_test \
+  ttest_test \
   utility_test vector_test
 
@@ -47 +48 @@
 alignment_test_SOURCES = alignment_test.cc
 averager_test_SOURCES = averager_test.cc
-commandline_test_SOURCES = commandline_test.cc
 consensus_inputranker_test_SOURCES = consensus_inputranker_test.cc
 crossvalidation_test_SOURCES = crossvalidation_test.cc
@@ -73 +73 @@
 svm_test_SOURCES = svm_test.cc
 target_test_SOURCES = target_test.cc
+ttest_test_SOURCES = ttest_test.cc
 utility_test_SOURCES = utility_test.cc
 vector_test_SOURCES = vector_test.cc

trunk/test/roc_test.cc

@@ -22 +22 @@
 */
 
+#include "yat/classifier/DataLookupWeighted1D.h"
 #include "yat/classifier/Target.h"
 #include "yat/statistics/ROC.h"
+#include "yat/statistics/utility.h"
 #include "yat/utility/matrix.h"
 #include "yat/utility/vector.h"
@@ -55 +57 @@
     value(i)=i;
   statistics::ROC roc;
-  for (size_t i=0; i<value.size(); ++i){
-    roc.add(value(i), target.binary(i));
-  }
+  add(roc, value, target);
   double area = roc.area();
   if (area!=0.0){
@@ -67 +67 @@
   target.set_binary(1,true);
   roc.reset();
-  for (size_t i=0; i<value.size(); ++i)
-    roc.add(value(i), target.binary(i));
+  add(roc, value, target);
   area = roc.area();
   if (area!=1.0){
@@ -100 +99 @@
   }
   
+  classifier::DataLookupWeighted1D dlw(target.size(),1.3);
+  add(roc, dlw, target);
+
   if (ok)
     return 0;