Changeset 931 for trunk/test

Timestamp:

Oct 5, 2007, 5:42:25 PM (16 years ago)

Author:

Markus Ringnér

Message:

Working on ticket:259. Removed old Distance see ticket:250

Location:

trunk/test

Files:

• Makefile.am (modified) (2 diffs)
• distance_test.cc (deleted)
• ensemble_test.cc (modified) (1 diff)
• ncc_test.cc (modified) (4 diffs)
• subset_generator_test.cc (modified) (1 diff)

trunk/test/Makefile.am

@@ -30 +30 @@
 TESTS = alignment_test averager_test                  \
   consensus_inputranker_test data_lookup_1d_test  \
-  distance_test \
   ensemble_test feature_selection_test fileutil_test inputranker_test \
   iterator_test kernel_test kernel_lookup_test \
@@ -53 +52 @@
 consensus_inputranker_test_SOURCES = consensus_inputranker_test.cc
 data_lookup_1d_test_SOURCES = data_lookup_1d_test.cc
-distance_test_SOURCES = distance_test.cc
 ensemble_test_SOURCES = ensemble_test.cc
 feature_selection_test_SOURCES = feature_selection_test.cc

trunk/test/ensemble_test.cc

@@ -33 +33 @@
 #include "yat/classifier/MatrixLookup.h"
 #include "yat/classifier/NCC.h"
-#include "yat/statistics/PearsonDistance.h"
 #include "yat/classifier/PolynomialKernelFunction.h"
 #include "yat/classifier/SVM.h"

trunk/test/ncc_test.cc

@@ -23 +23 @@
 
 #include "yat/classifier/IGP.h"
+#include "yat/classifier/Kernel_MEV.h"
+#include "yat/classifier/KernelLookup.h"
 #include "yat/classifier/MatrixLookup.h"
 #include "yat/classifier/MatrixLookupWeighted.h"
 #include "yat/classifier/NCC.h"
+#include "yat/classifier/PolynomialKernelFunction.h"
 #include "yat/classifier/Target.h"
 #include "yat/utility/matrix.h"
@@ -34 +37 @@
 #include <fstream>
 #include <iostream>
+#include <stdexcept>
 #include <sstream>
 #include <string>
@@ -55 +59 @@
   bool ok = true;
 
-  classifier::MatrixLookupWeighted ml(4,4);
+  classifier::MatrixLookup ml(4,4);
   std::vector<std::string> vec(4, "pos");
   vec[3]="bjds";
@@ -131 +135 @@
     ok = false;
   }
+
+  // testing rejection of KernelLookups
+  classifier::PolynomialKernelFunction kf;
+  classifier::Kernel_MEV kernel(ml,kf);
+  classifier::DataLookup2D* dl_kernel = new classifier::KernelLookup(kernel); 
+  try {
+    ok=0; // should catch error here
+    *error << ncc.make_classifier(*dl_kernel,target) << std::endl;
+  }
+  catch (std::runtime_error) {    
+    *error << "caught expected bad cast runtime_error" << std::endl;
+    ok=1;
+  }
+  delete dl_kernel;
   
-
   if(ok)
     *error << "OK" << std::endl;

trunk/test/subset_generator_test.cc

@@ -34 +34 @@
 #include "yat/classifier/NCC.h"
 #include "yat/statistics/AUC.h"
-#include "yat/statistics/PearsonDistance.h"
 #include "yat/utility/matrix.h"