Changeset 541

Timestamp:

Mar 5, 2006, 4:20:58 PM (16 years ago)

Author:

Peter

Message:

weights supported in CrossSplitter?

Location:

trunk/lib/classifier

Files:

• CrossSplitter.cc (modified) (2 diffs)
• CrossSplitter.h (modified) (3 diffs)

trunk/lib/classifier/CrossSplitter.cc

@@ -28 +28 @@
       // Dynamically allocated. Must be deleted in destructor.
       training_data_.push_back(data.training_data(training_index_[i]));
+      training_weight_.push_back
+        (new MatrixLookup(training_data_.back()->rows(),
+                          training_data_.back()->columns(),1));
       validation_data_.push_back(data.validation_data(training_index_[i], 
                                                     validation_index_[i]));
-      training_weight_.push_back(new MatrixLookup(0,1));
-      validation_weight_.push_back(new MatrixLookup(0,1));
+      validation_weight_.push_back
+        (new MatrixLookup(validation_data_.back()->rows(),
+                          validation_data_.back()->columns(),1));
+
+
+      training_target_.push_back(Target(target,training_index_[i]));
+      validation_target_.push_back(Target(target,validation_index_[i]));
+    }
+    assert(training_data_.size()==N);
+    assert(training_weight_.size()==N);
+    assert(training_target_.size()==N);
+    assert(validation_data_.size()==N);
+    assert(validation_weight_.size()==N);
+    assert(validation_target_.size()==N);
+  }
+
+  CrossSplitter::CrossSplitter(const Target& target, const DataLookup2D& data, 
+                               const MatrixLookup& weight,
+                               const size_t N, const size_t k)
+    : k_(k), state_(0), target_(target)
+  { 
+    assert(target.size()>1);
+    assert(target.size()==data.columns());
+
+    build(target, N, k);
+
+    for (size_t i=0; i<N; i++){
+      
+      // Dynamically allocated. Must be deleted in destructor.
+      training_data_.push_back(data.training_data(training_index_[i]));
+      validation_data_.push_back(data.validation_data(training_index_[i], 
+                                                    validation_index_[i]));
+      training_weight_.push_back(weight.training_data(training_index_[i]));
+      validation_weight_.push_back(weight.validation_data(training_index_[i], 
+                                                          validation_index_[i]));
 
 
@@ -52 +88 @@
     for (size_t i=0; i<validation_data_.size(); i++) 
       delete validation_data_[i];
+    for (size_t i=0; i<training_weight_.size(); i++) 
+      delete training_weight_[i];
+    for (size_t i=0; i<validation_weight_.size(); i++) 
+      delete validation_weight_[i];
   }
 

trunk/lib/classifier/CrossSplitter.h

@@ -51 +51 @@
     ///
     CrossSplitter(const Target& target, const DataLookup2D& data, 
-                  const DataLookup2D& weights,
+                  const MatrixLookup& weight,
                   const size_t N, const size_t k);
 
@@ -111 +111 @@
 
     ///
+    /// @return training data weight
+    ///
+    /// @note if state is invalid the result is undefined
+    ///
+    inline const DataLookup2D& training_weight(void) const 
+    { assert(more()); return *(training_weight_[state_]); } 
+
+    ///
     /// @return validation data
     ///
@@ -134 +142 @@
     { assert(more()); return validation_target_[state_]; }
 
+    ///
+    /// @return validation data weights
+    ///
+    /// @note if state is invalid the result is undefined
+    ///
+    inline const DataLookup2D& validation_weight(void) const 
+    { assert(more()); return *(validation_weight_[state_]); } 
+
   private:
     void build(const Target& target, size_t N, size_t k);