Changeset 540

Timestamp:

Mar 5, 2006, 4:02:11 PM (17 years ago)

Author:

Peter

Message:

added weights in CrossSplitter? - not supported in interface though.

Location:

trunk/lib/classifier

Files:

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

trunk/lib/classifier/CrossSplitter.cc

@@ -21 +21 @@
     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(new MatrixLookup(0,1));
+      validation_weight_.push_back(new MatrixLookup(0,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()
+  {
+    assert(training_data_.size()==validation_data_.size());
+    for (size_t i=0; i<training_data_.size(); i++) 
+      delete training_data_[i];
+    for (size_t i=0; i<validation_data_.size(); i++) 
+      delete validation_data_[i];
+  }
+
+  void CrossSplitter::build(const Target& target, size_t N, size_t k)
+  {
     std::vector<std::pair<size_t,size_t> > v;
     for (size_t i=0; i<target.size(); i++)
@@ -53 +88 @@
         }
 
-        // Dynamically allocated. Must be deleted in destructor.
-        training_data_.push_back(data.training_data(training_index));
-        validation_data_.push_back(data.validation_data(training_index, 
-                                                        validation_index));
-
-        training_target_.push_back(Target(target,training_index));
-        validation_target_.push_back(Target(target,validation_index));
         training_index_.push_back(training_index);
         validation_index_.push_back(validation_index);
-
       }
     }
-    assert(training_data_.size()==N);
-    assert(training_target_.size()==N);
     assert(training_index_.size()==N);
-    assert(validation_data_.size()==N);
-    assert(validation_target_.size()==N);
     assert(validation_index_.size()==N);
-  }
-
-  CrossSplitter::~CrossSplitter()
-  {
-    assert(training_data_.size()==validation_data_.size());
-    for (size_t i=0; i<training_data_.size(); i++) 
-      delete training_data_[i];
-    for (size_t i=0; i<validation_data_.size(); i++) 
-      delete validation_data_[i];
-  }
+}
 
 }} // of namespace classifier and namespace theplu

trunk/lib/classifier/CrossSplitter.h

@@ -5 +5 @@
 
 #include <c++_tools/classifier/Target.h>
+#include <c++_tools/classifier/MatrixLookup.h>
 
 
@@ -38 +39 @@
     ///
     CrossSplitter(const Target& target, const DataLookup2D& data, 
+                  const size_t N, const size_t k);
+
+    ///
+    /// @brief Constructor with weights
+    ///  
+    /// @parameter Target targets
+    /// @parameter data data to split up in validation and training.
+    /// @parameter weights accompanying data.
+    /// @parameter N total number of partitions
+    /// @parameter k for k-fold crossvalidation
+    ///
+    CrossSplitter(const Target& target, const DataLookup2D& data, 
+                  const DataLookup2D& weights,
                   const size_t N, const size_t k);
 
@@ -121 +135 @@
 
   private:
+    void build(const Target& target, size_t N, size_t k); 
+
     const size_t k_;
     u_long state_;
@@ -126 +142 @@
     
     std::vector<const DataLookup2D*> training_data_;
+    std::vector<const MatrixLookup*> training_weight_;
     std::vector<std::vector<size_t> > training_index_;
     std::vector<Target> training_target_;
 
     std::vector<const DataLookup2D*> validation_data_;
+    std::vector<const MatrixLookup*> validation_weight_;
     std::vector<std::vector<size_t> > validation_index_;
     std::vector<Target> validation_target_;