Changeset 1072 for trunk/test

Timestamp:

Feb 12, 2008, 1:22:27 AM (14 years ago)

Author:

Peter

Message:

fixes #309

Location:

trunk/test

Files:

• ensemble_test.cc (modified) (1 diff)
• subset_generator_test.cc (modified) (3 diffs)

trunk/test/ensemble_test.cc

@@ -83 +83 @@
   *error << "create Subsets" << std::endl;
   classifier::CrossValidationSampler sampler(target,3,3);
-  classifier::SubsetGenerator cv(sampler,kernel_lookup);
+  classifier::SubsetGenerator<classifier::DataLookup2D> cv(sampler,
+                                                           kernel_lookup);
   *error << "create ensemble" << std::endl;
   classifier::EnsembleBuilder ensemble(svm,sampler);

trunk/test/subset_generator_test.cc

@@ -102 +102 @@
   classifier::FeatureSelectorIR fs(score, 96, 0);
   *error << "building SubsetGenerator" << std::endl;
-  classifier::SubsetGenerator subset_data(sampler, data, fs);
-  classifier::SubsetGenerator subset_kernel(sampler, kernel, fs);
+  classifier::SubsetGenerator<classifier::DataLookup2D> subset_data(sampler, 
+                                                                    data, fs);
+  classifier::SubsetGenerator<classifier::DataLookup2D> subset_kernel(sampler, 
+                                                                      kernel,fs);
   return ok;
 }
@@ -128 +130 @@
   classifier::MatrixLookup data2(raw_data2);
   classifier::CrossValidationSampler cv2(target,3,3);
-  classifier::SubsetGenerator cv_test(cv2,data2);
+  classifier::SubsetGenerator<classifier::DataLookup2D> cv_test(cv2,data2);
 
   std::vector<size_t> sample_count(10,0);
@@ -161 +163 @@
     
     classifier::CrossValidationSampler sampler_training(tv_target,2,2);
-    classifier::SubsetGenerator cv_training(sampler_training,tv_view);
+    classifier::SubsetGenerator<classifier::DataLookup2D> 
+      cv_training(sampler_training,tv_view);
     std::vector<size_t> v_sample_count(6,0);
     std::vector<size_t> t_sample_count(6,0);