Changeset 558

Timestamp:

Mar 10, 2006, 4:58:16 PM (17 years ago)

Author:

Peter

Message:

ConsensusInputRanker? now supports weights

Location:

trunk/lib/classifier

Files:

• ConsensusInputRanker.cc (modified) (1 diff)
• CrossSplitter.cc (modified) (2 diffs)
• CrossSplitter.h (modified) (2 diffs)

trunk/lib/classifier/ConsensusInputRanker.cc

@@ -29 +29 @@
     rank_.resize(nof_inputs);
     while (sampler.more()){
-      // Peter, should support weights also (in sampler???)
-      input_rankers_.push_back(InputRanker(sampler.training_data(), 
-                                           sampler.training_target(), 
-                                           score_object));
+      if (sampler.weighted()){
+        input_rankers_.push_back(InputRanker(sampler.training_data(), 
+                                             sampler.training_target(), 
+                                             score_object));
+      }
+      else{
+        input_rankers_.push_back(InputRanker(sampler.training_data(), 
+                                             sampler.training_target(), 
+                                             score_object));
+      }
       sampler.next();
     }

trunk/lib/classifier/CrossSplitter.cc

@@ -17 +17 @@
   CrossSplitter::CrossSplitter(const Target& target, const DataLookup2D& data, 
                                const size_t N, const size_t k)
-    : k_(k), state_(0), target_(target)
+    : k_(k), state_(0), target_(target), weighted_(false)
   { 
     assert(target.size()>1);
@@ -52 +52 @@
                                const MatrixLookup& weight,
                                const size_t N, const size_t k)
-    : k_(k), state_(0), target_(target)
+    : k_(k), state_(0), target_(target), weighted_(true)
   { 
     assert(target.size()>1);

trunk/lib/classifier/CrossSplitter.h

@@ -150 +150 @@
     { assert(more()); return *(validation_weight_[state_]); } 
 
+    ///
+    /// @return true if weighted 
+    ///
+    inline bool weighted(void) const { return weighted_; }
+
   private:
     void build(const Target& target, size_t N, size_t k); 
@@ -156 +161 @@
     u_long state_;
     Target target_;
+    const bool weighted_;
     
     std::vector<const DataLookup2D*> training_data_;