Changeset 667 for trunk

Timestamp:

Oct 6, 2006, 9:03:19 AM (16 years ago)

Author:

Peter

Message:

refs #151 using Functor now in consensusinputranker to retrieve information from inputranker to sort on. Median is still hard-coded so I leave this ticket open.

Location:

trunk

Files:

• c++_tools/classifier/ConsensusInputRanker.cc (modified) (3 diffs)
• c++_tools/classifier/ConsensusInputRanker.h (modified) (2 diffs)
• c++_tools/classifier/IRRank.h (modified) (2 diffs)
• test/consensus_inputranker_test.cc (modified) (1 diff)

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

@@ -4 +4 @@
 
 #include <c++_tools/classifier/InputRanker.h>
+#include <c++_tools/classifier/IRRetrieve.h>
 #include <c++_tools/classifier/MatrixLookup.h>
 #include <c++_tools/classifier/MatrixLookupWeighted.h>
@@ -13 +14 @@
 
 #include <cassert>
+#include <functional>
 #include <iostream>
 #include <utility>
@@ -65 +67 @@
   {
 
-    // Sorting with respect to median rank
+    // Sorting with respect to median info (from retriever_)
     std::vector<std::pair<double,size_t> > medians(id_.size());
     for (size_t i=0; i<id_.size(); i++){ 
-      std::vector<size_t> ranks(input_rankers_.size());
+      std::vector<double> scores;
+      scores.reserve(input_rankers_.size());
       for (size_t j=0; j<input_rankers_.size(); j++) {
-        ranks[j]=input_rankers_[j].rank()[i];
+        scores.push_back(retriever_(input_rankers_[j],i));
       }
-      medians[i].first = statistics::median(ranks);
+      medians[i].first = statistics::median(scores);
       medians[i].second = i;
     }
     
     //sort medians and assign id_ and rank_
-    sort(medians.begin(), medians.end());
+    sort(medians.begin(), medians.end(),
+         std::greater<std::pair<double, size_t> >()); 
+         
     for (size_t i=0; i<medians.size(); i++){
       id_[i]=medians[i].second;

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

@@ -5 +5 @@
 
 #include <c++_tools/classifier/InputRanker.h>
-#include <c++_tools/classifier/IRRetrieve.h>
 
 namespace theplu {
@@ -13 +12 @@
 namespace classifier {  
 
+  class IRRetrieve;
   class MatrixLookup;
   class MatrixLookupWeighted;

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

@@ -5 +5 @@
 
 #include <c++_tools/classifier/InputRanker.h>
+#include <c++_tools/classifier/IRRetrieve.h>
 
 namespace theplu {
@@ -23 +24 @@
     inline double operator()(const InputRanker& ranker, size_t i) const
     {
-      return -ranker.rank()[i];
+      return -static_cast<double>(ranker.rank()[i]);
     }
   };

trunk/test/consensus_inputranker_test.cc

@@ -50 +50 @@
   if (cir.id(0)!=2 || cir.id(1)!=0 || cir.id(2)!=1){
     *error << "incorrect id" << endl;
+    std::cout << cir.id(0) << "=2" << std::endl;
+    std::cout << cir.id(1) << "=0" << std::endl;
+    std::cout << cir.id(2) << "=1" << std::endl;
     ok = false;
   }