Changeset 823

Timestamp:

Mar 19, 2007, 12:03:27 PM (17 years ago)

Author:

Peter

Message:

BootstrapSampler?. Fixes #134

Location:

trunk/yat/classifier

Files:

• BootstrapSampler.cc (added)
• BootstrapSampler.h (added)
• CrossValidationSampler.cc (modified) (1 diff)
• CrossValidationSampler.h (modified) (2 diffs)
• Makefile.am (modified) (2 diffs)
• Sampler.cc (modified) (1 diff)
• Sampler.h (modified) (1 diff)

trunk/yat/classifier/CrossValidationSampler.cc

@@ -38 +38 @@
                                                  const size_t N, 
                                                  const size_t k)
-    : Sampler(target), k_(k)
+    : Sampler(target, N), k_(k)
   { 
     assert(target.size()>1);

trunk/yat/classifier/CrossValidationSampler.h

@@ -29 +29 @@
 namespace theplu {
 namespace yat {
-namespace classifier {  
+namespace classifier {
 
   class Target;
@@ -42 +42 @@
   /// samples are shuffled and... In total there are N partitions, in
   /// other words, each sample is in validation roughly N/k
-  ///   
-  class CrossValidationSampler : public Sampler
-  {
-  
-  public:
-    ///
-    /// @brief Constructor 
-    ///  
+  /// 
+  class CrossValidationSampler : public Sampler
+  {
+
+  public:
+    ///
+    /// @brief Constructor 
+    ///
     /// @a target targets.    
     /// @a N total number of partitions.

trunk/yat/classifier/Makefile.am

@@ -24 +24 @@
 noinst_LTLIBRARIES = libclassifier.la
 libclassifier_la_SOURCES = \
+  BootstrapSampler.cc \
   ConsensusInputRanker.cc \
   CrossValidationSampler.cc \
@@ -60 +61 @@
 
 include_classifier_HEADERS = \
+  BootstrapSampler.h \
   ConsensusInputRanker.h \
   CrossValidationSampler.h \

trunk/yat/classifier/Sampler.cc

@@ -29 +29 @@
 namespace classifier {  
 
-  Sampler::Sampler(const Target& target)
+  Sampler::Sampler(const Target& target, size_t N)
     : target_(target)
   { 
+    training_index_.reserve(N);
+    training_target_.reserve(N);
+    validation_index_.reserve(N);
+    validation_target_.reserve(N);
   }
 

trunk/yat/classifier/Sampler.h

@@ -36 +36 @@
   /// @brief Interface class for dividing samples into training and
   /// validation.
-  ///   
+  ///   
 
-  class Sampler
-  {
-  
-  public:
-    ///
-    /// @brief Constructor 
-    ///  
+  class Sampler
+  {
+
+  public:
+    ///
+    /// @brief Constructor 
+    ///
     /// @param target used to balance partitions
+    /// @param Number of partitions
     ///
-    Sampler(const Target& target);
+    Sampler(const Target& target, size_t N);
 
     ///