Changeset 522

Timestamp:

Feb 23, 2006, 9:46:13 AM (16 years ago)

Author:

Peter

Message:

added function to add InputRanker? to ConsensusInputRanker?

Location:

trunk/lib/classifier

Files:

• ConsensusInputRanker.cc (modified) (3 diffs)
• ConsensusInputRanker.h (modified) (1 diff)

trunk/lib/classifier/ConsensusInputRanker.cc

@@ -26 +26 @@
     assert(sampler.size());
     size_t nof_inputs = sampler.training_data().rows();
+    id_.resize(nof_inputs);
+    rank_.resize(nof_inputs);
     while (sampler.more()){
       // Peter, should support weights also (in sampler???)
@@ -33 +35 @@
       sampler.next();
     }
+    update();
+  }
 
-
+  void ConsensusInputRanker::update(void)
+  {
 
     // Sorting with respect to median rank
-    std::vector<std::pair<double,size_t> > medians(nof_inputs);
-    for (size_t i=0; i<nof_inputs; i++){ 
-      std::vector<size_t> ranks(sampler.size());
-      for (size_t j=0; j<sampler.size(); j++) {
+    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());
+      for (size_t j=0; j<input_rankers_.size(); j++) {
         ranks[j]=input_rankers_[j].rank(i);
       }
@@ -49 +54 @@
     //sort medians and assign id_ and rank_
     sort(medians.begin(), medians.end());
-    id_.resize(nof_inputs);
-    rank_.resize(nof_inputs);
-    for (size_t i=0; i<nof_inputs; i++){
+    for (size_t i=0; i<medians.size(); i++){
       id_[i]=medians[i].second;
       rank_[id_[i]]=i;
     }
-
   }
 

trunk/lib/classifier/ConsensusInputRanker.h

@@ -21 +21 @@
   
   public:
+    ///
+    /// @brief Default constructor
+    ///
+    ConsensusInputRanker(void);
+    
     ///
     /// Constructor
+    /// @todo doc
+    ConsensusInputRanker(CrossSplitter&, statistics::Score&);
+    
     ///
-    ConsensusInputRanker(CrossSplitter&, statistics::Score&);
-
+    /// @brief add an InputRanker
+    ///
+    /// @note update() must be called to make the added InputRanker to
+    /// influence consensus ids and ranks. If a sequence of
+    /// InputRankers are added, update() need to be called only after
+    /// the last InputRanker is added.
+    ///
+    inline void add(const InputRanker& ir) { input_rankers_.push_back(ir); }
+    
     ///
     /// Row with lowest rank (highest score) is ranked as number zero
     /// @return index of row ranked as number \a i
     ///
-    inline size_t id(const size_t i) const {return id_[i];}
+    inline size_t id(const size_t i) const { return id_[i]; }
     
     ///
-    /// Row with lowest rank (highest score) is ranked as number zero
-    /// @return rank for row \a i
+    /// Row with lowest rank (highest score) is ranked as number zero
+    /// @return rank for row \a i
     ///
-    inline size_t rank(const size_t i) const {return rank_[i];}
+    inline size_t rank(const size_t i) const { return rank_[i]; }
+    
+    ///
+    /// update ids and ranks
+    ///
+    void update(void);
 
 
   private:
+
     std::vector<size_t> id_;
     std::vector<InputRanker> input_rankers_;
     std::vector<size_t> rank_;
+
   };