Changeset 864 for trunk

Timestamp:

Sep 10, 2007, 4:38:14 PM (16 years ago)

Author:

Markus Ringnér

Message:

Added a lot of tests to feature_selection_test

File:

• trunk/test/feature_selection_test.cc (modified) (4 diffs)

trunk/test/feature_selection_test.cc

@@ -23 +23 @@
 */
 
+#include "yat/classifier/DataLookupWeighted1D.h"
 #include "yat/classifier/FeatureSelectorIR.h"
 #include "yat/classifier/FeatureSelectorRandom.h"
 #include "yat/classifier/MatrixLookupWeighted.h"
 #include "yat/classifier/Target.h"
-#include "yat/statistics/AUC.h"
+#include "yat/statistics/SNRScore.h"
 
 #include "yat/utility/matrix.h"
@@ -53 +54 @@
   bool ok = true;
 
-  statistics::AUC roc;
-  classifier::FeatureSelectorIR f(roc, 12);
+  statistics::SNRScore snr;
+  classifier::FeatureSelectorIR f(snr, 12);
   classifier::FeatureSelectorRandom f2(12);
 
@@ -85 +86 @@
 
   f.update(dataviewweighted,targets);
-  *error << "\nAUC ordered ordered features (top 12):\n";
+  *error << "\nSNR ordered ordered features (top 12):\n";
   features=f.features();
   std::copy(features.begin(),features.end(),
@@ -91 +92 @@
   *error << std::endl;
 
+  size_t best_feature=features[0];
+  if(best_feature!=69) {
+    *error << "\nERROR: Incorrect best feature found!\n" << std::endl;
+    ok=0;
+  }
+
+  classifier::DataLookupWeighted1D row(dataviewweighted,best_feature,true);
+  double score_diff=fabs(snr.score(targets,row)-1.47804);
+  if(score_diff>0.00001) {
+    *error << "\nERROR: Best score not what expected!\n" << std::endl;
+    ok=0;
+  }
+  
+  // Re-rank the best features 
+  classifier::MatrixLookupWeighted ranked=f.get(dataviewweighted);
+  f.update(ranked,targets);
+  features=f.features();
+  for(size_t i=0;i<features.size();i++) {
+    if(features[i]!=i) {
+      ok=0;
+      *error << "ERROR: Problem with top-ranked feature" << std::endl;
+    }
+  }
 
   if (ok)