Changeset 828 for trunk/test/consensus_inputranker_test.cc

Timestamp:

Mar 19, 2007, 11:15:43 PM (16 years ago)

Author:

Peter

Message:

Generalized ConsenusInputRanker?, Fixes #151

File:

• trunk/test/consensus_inputranker_test.cc (modified) (2 diffs)

trunk/test/consensus_inputranker_test.cc

@@ -28 +28 @@
 #include "yat/classifier/CrossValidationSampler.h"
 #include "yat/classifier/IRRank.h"
+#include "yat/statistics/VectorFunction.h"
 
 #include <cstdlib>
@@ -63 +64 @@
   *error << "Building Consensus_Inputranker" << std::endl;
   theplu::yat::classifier::IRRank retrieve;
-  theplu::yat::classifier::ConsensusInputRanker cir(sampler,data,roc,retrieve);
-  *error << "Done" << std::endl;
+  theplu::yat::statistics::Median median;
+  theplu::yat::classifier::ConsensusInputRanker cir(retrieve,median);
+  cir.add(sampler,data,roc);
 
+  *error << "test ids... ";
   if (cir.id(0)!=2 || cir.id(1)!=0 || cir.id(2)!=1){
-    *error << "incorrect id" << endl;
-    ok = false;
-  }
-  
-  if (cir.rank(0)!=1 || cir.rank(1)!=2 || cir.rank(2)!=0){
-    *error << "incorrect rank" << endl;
+    *error << "\nincorrect id for weighted" << endl;
     ok=false;
   }
+  else 
+    *error << "ok." << std::endl;
+
+  *error << "test ranks... ";
+  if (cir.rank(0)!=1 || cir.rank(1)!=2 || cir.rank(2)!=0){
+    *error << "\nincorrect rank for weighted" << endl;
+    ok=false;
+  }
+  else 
+    *error << "ok." << std::endl;
 
   theplu::yat::utility::matrix flag(data.rows(),data.columns(),1);
   // Peter, fix weighted version instead
-  theplu::yat::classifier::ConsensusInputRanker cir2(sampler,data,roc,retrieve);
+  theplu::yat::classifier::ConsensusInputRanker cir2(retrieve,median);
+  cir2.add(sampler,data,roc);
 
+  *error << "test ids... ";
   if (cir2.id(0)!=2 || cir2.id(1)!=0 || cir2.id(2)!=1){
-    *error << "incorrect id for weighted" << endl;
+    *error << "\nincorrect id for weighted" << endl;
     ok=false;
   }
+  else 
+    *error << "ok." << std::endl;
   
+  *error << "test ranks... ";
   if (cir2.rank(0)!=1 || cir2.rank(1)!=2 || cir2.rank(2)!=0){
-    *error << "incorrect rank for weighted" << endl;
+    *error << "\nincorrect rank for weighted" << endl;
     ok=false;
   }
+  else 
+    *error << "ok." << std::endl;
 
   if (error!=&std::cerr)