Changeset 2132

Timestamp:

Dec 24, 2009, 2:13:05 AM (14 years ago)

Author:

Peter

Message:

fixes #579

Location:

branches/0.5-stable

Files:

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

branches/0.5-stable/test/ensemble_test.cc

@@ -114 +114 @@
   suite.err() << "build ensemble" << std::endl;
   ensemble.build();
+  utility::Vector out(target.size(),0);
+  for (size_t i = 0; i<out.size(); ++i) {
+    out(i)=ensemble.validate()[0][i].mean(); 
+  }
+  statistics::AUC roc;
+  suite.err() << roc.score(target,out) << std::endl;
+
   std::vector<std::vector<statistics::Averager> > result;
   ensemble.predict(kernel_lookup, result);
-  
-  utility::Vector out(target.size(),0);
-  for (size_t i = 0; i<out.size(); ++i)
-    out(i)=ensemble.validate()[0][i].mean(); 
-  statistics::AUC roc;
-  suite.err() << roc.score(target,out) << std::endl;
+  for (size_t i = 0; i<result.size(); ++i) {
+    for (size_t j=0; j<result[0].size(); ++j) {
+      if (!suite.add(result[i][j].variance() > 0)) {
+        suite.err() << "error: element " << i << " " << j << "\n";
+        suite.err() << "expected finite prediction varince\n";
+        suite.err() << "found: " << result[i][j].variance() << "\n";
+      }
+    } 
+  }
 
   {

branches/0.5-stable/yat/classifier/EnsembleBuilder.h

@@ -192 +192 @@
       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));    
+    }
   }