Changeset 559 for trunk/lib/classifier/EnsembleBuilder.cc

Timestamp:

Mar 11, 2006, 11:21:27 PM (17 years ago)

Author:

Peter

Message:

some changes in EB

File:

• trunk/lib/classifier/EnsembleBuilder.cc (modified) (3 diffs)

trunk/lib/classifier/EnsembleBuilder.cc

@@ -5 +5 @@
 #include <c++_tools/classifier/CrossSplitter.h>
 #include <c++_tools/classifier/DataLookup2D.h>
+#include <c++_tools/classifier/KernelLookup.h>
 #include <c++_tools/classifier/SupervisedClassifier.h>
 #include <c++_tools/classifier/Target.h>
@@ -31 +32 @@
       const DataLookup2D& training=cross_splitter_.training_data();
       const Target& targets=cross_splitter_.training_target();
+
       SupervisedClassifier* classifier=
         mother_.make_classifier(training,targets);
@@ -52 +54 @@
     size_t k=0;
     gslapi::matrix prediction;   
-    while(cross_splitter_.more()) {
-      classifier(k++).predict(data,prediction);
+   
 
-      for(size_t i=0; i<prediction.rows();i++) 
-        for(size_t j=0; j<prediction.columns();j++) 
-          result[i][j].add(prediction(i,j));
-
-      cross_splitter_.next();
+    try {
+      const KernelLookup& kernel = dynamic_cast<const KernelLookup&>(data);
+      while(cross_splitter_.more()) {
+        classifier(k++).predict(KernelLookup(kernel,
+                                             cross_splitter_.training_index(),
+                                             true),
+                                prediction);
+        for(size_t i=0; i<prediction.rows();i++) 
+          for(size_t j=0; j<prediction.columns();j++) 
+            result[i][j].add(prediction(i,j));
+        cross_splitter_.next();
+      }
     }
-
+    catch (std::bad_cast) {
+      while(cross_splitter_.more()) {
+        classifier(k++).predict(data,prediction);
+        for(size_t i=0; i<prediction.rows();i++) 
+          for(size_t j=0; j<prediction.columns();j++) 
+            result[i][j].add(prediction(i,j));
+        
+        cross_splitter_.next();
+      }
+    }
   }