Changeset 2138 for trunk/yat/classifier/EnsembleBuilder.h

Timestamp:

Dec 24, 2009, 9:23:49 PM (14 years ago)

Author:

Peter

Message:

merge patch release 0.5.6 into trunk. Delta 0.5.6 - 0.5.5

File:

• trunk/yat/classifier/EnsembleBuilder.h (modified) (3 diffs)

trunk/yat/classifier/EnsembleBuilder.h

@@ -193 +193 @@
       Data sub_data = test_data(data, k);
       classifier(k).predict(sub_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));    
+      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));    
+    }
   }
 
@@ -233 +232 @@
     // weighted case
     if (kernel.weighted()){
-      YAT_ASSERT(false);
       // no feature selection
       if (kernel.data_weighted().rows()==subset_->training_features(k).size())
@@ -248 +246 @@
     
     // feature selection
-    return subset_->training_data(k).test_kernel(test_data(kernel.data(),k));
+    MatrixLookup ml = test_data(kernel.data(),k);
+    return subset_->training_data(k).test_kernel(ml);
   }