Changeset 1227

Timestamp:

Mar 13, 2008, 3:43:41 AM (16 years ago)

Author:

Peter

Message:

fixes #341 and #93

Location:

trunk

Files:

• test/ensemble_test.cc (modified) (1 diff)
• yat/classifier/EnsembleBuilder.h (modified) (4 diffs)

trunk/test/ensemble_test.cc

@@ -130 +130 @@
   *error << roc.score(target,out) << std::endl;
 
+  {
+    *error << "create ensemble" << std::endl;
+    classifier::EnsembleBuilder<classifier::SVM, classifier::KernelLookup> 
+      ensemble(svm, kernel_lookup, sampler);
+    *error << "test validate() before build()\n";
+    ensemble.validate();
+    std::vector<std::vector<statistics::Averager> > result;
+    *error << "test predict() before build()\n";
+    ensemble.predict(kernel_lookup, result);
+  }
   delete kf;
 

trunk/yat/classifier/EnsembleBuilder.h

@@ -73 +73 @@
     virtual ~EnsembleBuilder(void);
 
-    ///
-    /// Generate ensemble. Function trains each member of the Ensemble.
-    ///
+    /**
+       \brief Generate ensemble. 
+       
+       Function trains each member of the Ensemble.
+    */
     void build(void);
 
     ///
-    /// @return classifier
+    /// @return ith classifier
     ///
     const Classifier& classifier(size_t i) const;
       
     ///
-    /// @return Number of classifiers in ensemble
+    /// @return Number of classifiers in ensemble. Prior build(void)
+    /// is issued size is zero.
     ///
     u_long size(void) const;
@@ -156 +159 @@
   void EnsembleBuilder<C, D>::build(void) 
   {
-    for(u_long i=0; i<subset_->size();++i) {
-      C* classifier = mother_.make_classifier();
-      classifier->train(subset_->training_data(i), 
-                        subset_->training_target(i));
-      classifier_.push_back(classifier);
-    }   
+    if (classifier_.empty()){
+      for(u_long i=0; i<subset_->size();++i) {
+        C* classifier = mother_.make_classifier();
+        classifier->train(subset_->training_data(i), 
+                          subset_->training_target(i));
+        classifier_.push_back(classifier);
+      }   
+    }
   }
 
@@ -176 +181 @@
   (const D& data, std::vector<std::vector<statistics::Averager> >& result)
   {
-    result.clear();
-    result.reserve(subset_->target().nof_classes());    
-    for(size_t i=0; i<subset_->target().nof_classes();i++)
-      result.push_back(std::vector<statistics::Averager>(data.columns()));
+    result = std::vector<std::vector<statistics::Averager> >
+      (subset_->target().nof_classes(), 
+       std::vector<statistics::Averager>(data.columns()));
     
     utility::Matrix prediction;  
 
-    for(u_long k=0;k<subset_->size();++k) {       
+    for(u_long k=0;k<size();++k) {        
       D sub_data =  test_data(data, k);
       classifier(k).predict(sub_data,prediction);
@@ -246 +250 @@
   EnsembleBuilder<C, D>::validate(void)
   {
-    validation_result_.clear();
-
-    validation_result_.reserve(subset_->target().nof_classes());    
-    for(size_t i=0; i<subset_->target().nof_classes();i++)
-      validation_result_.push_back(std::vector<statistics::Averager>(subset_->target().size()));
-    
+    // Don't recalculate validation_result_
+    if (!validation_result_.empty())
+      return validation_result_;
+
+    validation_result_ = std::vector<std::vector<statistics::Averager> >
+      (subset_->target().nof_classes(), 
+       std::vector<statistics::Averager>(subset_->target().size()));
+
     utility::Matrix prediction;  
-    for(u_long k=0;k<subset_->size();k++) {
+    for(u_long k=0;k<size();k++) {
       classifier(k).predict(subset_->validation_data(k),prediction);