Changeset 781 for trunk/test

Timestamp:

Mar 5, 2007, 8:44:03 PM (16 years ago)

Author:

Peter

Message:

changing name to ROCScore and also added some cassert includes

Location:

trunk/test

Files:

• consensus_inputranker_test.cc (modified) (2 diffs)
• crossvalidation_test.cc (modified) (1 diff)
• feature_selection_test.cc (modified) (2 diffs)
• inputranker_test.cc (modified) (2 diffs)
• kernel_test.cc (modified) (1 diff)
• score_test.cc (modified) (3 diffs)
• subset_generator_test.cc (modified) (3 diffs)

trunk/test/consensus_inputranker_test.cc

@@ -23 +23 @@
 
 #include "yat/classifier/ConsensusInputRanker.h"
-#include "yat/statistics/ROCscore.h"
+#include "yat/statistics/ROCScore.h"
 #include "yat/utility/matrix.h"
 #include "yat/classifier/MatrixLookup.h"
@@ -59 +59 @@
 
   
-  theplu::yat::statistics::ROCscore roc;
+  theplu::yat::statistics::ROCScore roc;
   theplu::yat::classifier::CrossValidationSampler sampler(target,30,3);
   *error << "Building Consensus_Inputranker" << std::endl;

trunk/test/crossvalidation_test.cc

@@ -28 +28 @@
 #include "yat/utility/matrix.h"
 
+#include <cassert>
 #include <cstdlib>
 #include <fstream>

trunk/test/feature_selection_test.cc

@@ -24 +24 @@
 #include "yat/classifier/FeatureSelectorIR.h"
 #include "yat/classifier/FeatureSelectorRandom.h"
-#include "yat/statistics/ROCscore.h"
+#include "yat/statistics/ROCScore.h"
 
 #include <fstream>
@@ -45 +45 @@
   bool ok = true;
 
-  statistics::ROCscore roc;
+  statistics::ROCScore roc;
   classifier::FeatureSelectorIR f(roc, 12);
   classifier::FeatureSelectorRandom f2(12);

trunk/test/inputranker_test.cc

@@ -23 +23 @@
 
 #include "yat/classifier/InputRanker.h"
-#include "yat/statistics/ROCscore.h"
+#include "yat/statistics/ROCScore.h"
 #include "yat/utility/matrix.h"
 #include "yat/classifier/MatrixLookup.h"
@@ -57 +57 @@
   is.close();
 
-  statistics::ROCscore roc;
+  statistics::ROCScore roc;
   classifier::InputRanker ir(data,target,roc);
   if (ir.id()[0]!=2 || ir.id()[1]!=0 || ir.id()[2]!=1){

trunk/test/kernel_test.cc

@@ -30 +30 @@
 #include "yat/classifier/Kernel_SEV.h"
 
+#include <cassert>
 #include <cmath>
 #include <cstdlib>

trunk/test/score_test.cc

@@ -25 +25 @@
 #include "yat/statistics/FoldChange.h"
 #include "yat/statistics/Pearson.h"
-#include "yat/statistics/ROCscore.h"
+#include "yat/statistics/ROCScore.h"
 #include "yat/statistics/SAMScore.h"
 #include "yat/statistics/tScore.h"
@@ -52 +52 @@
   bool ok = true;
 
-  *error << "testing ROCscore" << 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::ROCscore roc;
+  statistics::ROCScore roc;
   double area = roc.score(target, value);
   if (area!=1.0){

trunk/test/subset_generator_test.cc

@@ -32 +32 @@
 #include "yat/classifier/SVM.h"
 #include "yat/classifier/NCC.h"
-#include "yat/statistics/ROCscore.h"
+#include "yat/statistics/ROCScore.h"
 #include "yat/statistics/PearsonDistance.h"
 #include "yat/utility/matrix.h"
 
+#include <cassert>
 #include <fstream>
 #include <iostream>
@@ -78 +79 @@
   classifier::CrossValidationSampler sampler(target, 30, 3);
 
-  statistics::ROCscore score;
+  statistics::ROCScore score;
   classifier::FeatureSelectorIR fs(score, 96, 0);
   *error << "building SubsetGenerator" << std::endl;
@@ -95 +96 @@
   utility::vector out(target.size(),0);
   for (size_t i = 0; i<out.size(); ++i)
-    out(i)=ensemble_svm.validate()[0][i].mean();
-  statistics::ROCscore roc;
+    out(i)=ensemble_svm.validate()[0][i].mean(); 
+  statistics::ROCScore roc;
   *error << roc.score(target,out) << std::endl;