Changeset 868 for trunk/yat/classifier

Timestamp:

Sep 14, 2007, 6:51:04 PM (16 years ago)

Author:

Peter

Message:

fixes ticket:236

File:

• trunk/yat/classifier/EnsembleBuilder.cc (modified) (1 diff)

trunk/yat/classifier/EnsembleBuilder.cc

@@ -94 +94 @@
     
     utility::matrix prediction;  
-    
-    const KernelLookup* kernel = dynamic_cast<const KernelLookup*>(&data);    
-    const MatrixLookupWeighted* mw = 
-      dynamic_cast<const MatrixLookupWeighted*>(&data);   
-    const MatrixLookup* m = dynamic_cast<const MatrixLookup*>(&data);
 
-    if(kernel) {
-      for(u_long k=0;k<subset_->size();k++) {       
-        KernelLookup sub_kernel(*kernel,subset_->training_index(k),true);
-        classifier(k).predict(sub_kernel,prediction);
-      }
-    }
-    else if(mw) {
-      for(u_long k=0;k<subset_->size();k++) {
-        MatrixLookupWeighted sub_matrix(*mw,subset_->training_features(k),true);
-        classifier(k).predict(sub_matrix,prediction);
-      }
-    }
-    else if(m) {
-      for(u_long k=0;k<subset_->size();k++) {       
-        MatrixLookup sub_matrix(*m,subset_->training_features(k),true);
-        classifier(k).predict(sub_matrix,prediction);       
-      }
-    }
-    else {
-      std::string str;
-      str = "Error in NCC::predict: DataLookup2D of unexpected class.";
-      throw std::runtime_error(str);
+    for(u_long k=0;k<subset_->size();++k) {       
+      const DataLookup2D* sub_data =
+        data.selected(subset_->training_features(k));
+      assert(sub_data);
+      classifier(k).predict(*sub_data,prediction);
+      delete sub_data;
     }