Changeset 521

Timestamp:

Feb 22, 2006, 4:41:55 PM (16 years ago)

Author:

Peter

Message:

extended target and ensemble tests

Location:

trunk/test

Files:

• ensemble_test.cc (modified) (1 diff)
• target_test.cc (modified) (1 diff)

trunk/test/ensemble_test.cc

@@ -47 +47 @@
   is.close();
 
-  is.open("data/nm_alpha_linear_matlab.txt");
-  gslapi::vector alpha_matlab(is);
-  is.close();
-
   classifier::KernelLookup kernel_lookup(kernel);
   classifier::SVM svm(kernel_lookup, target);
   classifier::CrossSplitter cv(target,kernel_lookup, 3, 3);
+  classifier::EnsembleBuilder ensemble(svm,cv);
+  ensemble.build();
   
   delete kf;

trunk/test/target_test.cc

@@ -43 +43 @@
     }
   }
+  std::vector<size_t> sub;
+  sub.push_back(2);
+  sub.push_back(1);
+  classifier::Target sub_target(target3,sub);
+  if (target3(sub[0])!=sub_target(0) || target3(sub[1])!=sub_target(1)){
+    ok = false;
+    *error << "error in constructor Target(const Target&, std::vector<size_t>&)"
+           << "\nclasses are not preserved" << std::endl;
+  }
+  if (target3.binary(sub[0])!=sub_target.binary(0) || 
+      target3.binary(sub[1])!=sub_target.binary(1)){
+    ok = false;
+    *error << "error in constructor Target(const Target&, std::vector<size_t>&)"
+           << "\nbinary classes are not preserved" << std::endl;
+  }
+
+
   std::vector<std::string> label(31,"negative");
   for (size_t i=0; i<16; i++)