Changeset 666 for trunk

Timestamp:

Oct 6, 2006, 6:07:54 AM (17 years ago)

Author:

Peter

Message:

refs #151, added IRRetreive functors and prepared ConsensusInputRanker? for usage.

Location:

trunk

Files:

• c++_tools/classifier/ConsensusInputRanker.cc (modified) (2 diffs)
• c++_tools/classifier/ConsensusInputRanker.h (modified) (5 diffs)
• c++_tools/classifier/IRRank.h (added)
• c++_tools/classifier/IRRetrieve.h (added)
• c++_tools/classifier/IRScore.h (added)
• c++_tools/classifier/Makefile.am (modified) (1 diff)
• test/consensus_inputranker_test.cc (modified) (3 diffs)

trunk/c++_tools/classifier/ConsensusInputRanker.cc

@@ -21 +21 @@
 namespace classifier {  
 
+  ConsensusInputRanker::ConsensusInputRanker(const IRRetrieve& retriever)
+    : retriever_(retriever)
+  {
+  }
+
+
   ConsensusInputRanker::ConsensusInputRanker(const Sampler& sampler, 
                                              const MatrixLookup& data, 
-                                             statistics::Score& score)
+                                             statistics::Score& score,
+                                             const IRRetrieve& retriever)
+    : retriever_(retriever)
   {
     assert(sampler.size());
@@ -38 +46 @@
   ConsensusInputRanker::ConsensusInputRanker(const Sampler& sampler, 
                                              const MatrixLookupWeighted& data, 
-                                             statistics::Score& score)
+                                             statistics::Score& score,
+                                             const IRRetrieve& retriever)
+    : retriever_(retriever)
   {
     assert(sampler.size());

trunk/c++_tools/classifier/ConsensusInputRanker.h

@@ -5 +5 @@
 
 #include <c++_tools/classifier/InputRanker.h>
+#include <c++_tools/classifier/IRRetrieve.h>
 
 namespace theplu {
@@ -48 +49 @@
     /// Truly does nothing but creates a few empty member vectors.
     /// 
-    //ConsensusInputRanker(void);
+    ConsensusInputRanker(const IRRetrieve&);
     
     ///
@@ -57 +58 @@
     /// 
     ConsensusInputRanker(const Sampler& sampler, const MatrixLookup&, 
-                         statistics::Score& s);
+                         statistics::Score& s, const IRRetrieve&);
     
     ///
@@ -67 +68 @@
     ConsensusInputRanker(const Sampler& sampler, 
                          const MatrixLookupWeighted& data, 
-                         statistics::Score& score);
+                         statistics::Score& score, const IRRetrieve&);
     
     ///
@@ -102 +103 @@
     std::vector<InputRanker> input_rankers_;
     std::vector<size_t> rank_;
+    const IRRetrieve& retriever_;
 
   };

trunk/c++_tools/classifier/Makefile.am

@@ -37 +37 @@
   IGP.cc \
   InputRanker.cc \
+  IRFunctor.h \
+  IRRank.h \
+  IRScore.h \
   Kernel.cc \
   Kernel_MEV.cc \

trunk/test/consensus_inputranker_test.cc

@@ -8 +8 @@
 #include <c++_tools/classifier/MatrixLookup.h>
 #include <c++_tools/classifier/CrossValidationSampler.h>
+#include <c++_tools/classifier/IRRank.h>
 
 #include <cstdlib>
@@ -43 +44 @@
   theplu::classifier::CrossValidationSampler sampler(target,30,3);
   *error << "Building Consensus_Inputranker" << std::endl;
-  theplu::classifier::ConsensusInputRanker cir(sampler,data,roc);
+  theplu::classifier::IRRank retrieve;
+  theplu::classifier::ConsensusInputRanker cir(sampler,data,roc,retrieve);
   *error << "Done" << std::endl;
 
@@ -58 +60 @@
   theplu::utility::matrix flag(data.rows(),data.columns(),1);
   // Peter, fix weighted version instead
-  theplu::classifier::ConsensusInputRanker cir2(sampler,data,roc);
+  theplu::classifier::ConsensusInputRanker cir2(sampler,data,roc,retrieve);
 
   if (cir2.id(0)!=2 || cir2.id(1)!=0 || cir2.id(2)!=1){