Moved rejectionstrategy

shogun-toolbox · Apr 29, 2012 · 549fddc · 549fddc
1 parent 686b412
commit 549fddc
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/src/interfaces/modular/Classifier.i b/src/interfaces/modular/Classifier.i
@@ -54,6 +54,8 @@
 %rename(SVMLight) CSVMLight;
 #endif //USE_SVMLIGHT
 
+%rename(ThresholdRejectionStrategy) CThresholdRejectionStrategy;
+%rename(DixonQTestRejectionStrategy) CDixonQTestRejectionStrategy;
 %rename(MulticlassStrategy) CMulticlassStrategy;
 %rename(MulticlassOneVsRestStrategy) CMulticlassOneVsRestStrategy;
 %rename(MulticlassOneVsOneStrategy) CMulticlassOneVsOneStrategy;
@@ -105,6 +107,7 @@
 %include <shogun/classifier/vw/VowpalWabbit.h>
 %include <shogun/classifier/svm/NewtonSVM.h>
 
+%include <shogun/multiclass/RejectionStrategy.h>
 %include <shogun/multiclass/MulticlassStrategy.h>
 %include <shogun/multiclass/MulticlassOneVsRestStrategy.h>
 %include <shogun/multiclass/MulticlassOneVsOneStrategy.h>

diff --git a/src/interfaces/modular/Classifier_includes.i b/src/interfaces/modular/Classifier_includes.i
@@ -34,6 +34,7 @@
  #include <shogun/classifier/vw/VowpalWabbit.h>
  #include <shogun/classifier/svm/NewtonSVM.h>
 
+ #include <shogun/multiclass/RejectionStrategy.h>
  #include <shogun/multiclass/MulticlassStrategy.h>
  #include <shogun/multiclass/MulticlassOneVsRestStrategy.h>
  #include <shogun/multiclass/MulticlassOneVsOneStrategy.h>

diff --git a/src/interfaces/modular/Features.i b/src/interfaces/modular/Features.i
@@ -33,8 +33,6 @@
 %rename(CombinedFeatures) CCombinedFeatures;
 %rename(CombinedDotFeatures) CCombinedDotFeatures;
 %rename(Labels) CLabels;
-%rename(RejectionStrategy) CRejectionStrategy;
-%rename(ThresholdReject) CThresholdReject;
 %rename(RealFileFeatures) CRealFileFeatures;
 %rename(FKFeatures) CFKFeatures;
 %rename(TOPFeatures) CTOPFeatures;
@@ -360,7 +358,6 @@ namespace shogun
 %include <shogun/features/CombinedDotFeatures.h>
 
 %include <shogun/features/Labels.h>
-%include <shogun/features/RejectionStrategy.h>
 %include <shogun/features/RealFileFeatures.h>
 %include <shogun/features/FKFeatures.h>
 %include <shogun/features/TOPFeatures.h>

diff --git a/src/interfaces/modular/Features_includes.i b/src/interfaces/modular/Features_includes.i
@@ -19,7 +19,6 @@
 #include <shogun/features/CombinedFeatures.h>
 #include <shogun/features/CombinedDotFeatures.h>
 #include <shogun/features/Labels.h>
-#include <shogun/features/RejectionStrategy.h>
 #include <shogun/features/RealFileFeatures.h>
 #include <shogun/features/FKFeatures.h>
 #include <shogun/features/TOPFeatures.h>

diff --git a/src/shogun/multiclass/MulticlassStrategy.h b/src/shogun/multiclass/MulticlassStrategy.h
@@ -13,7 +13,7 @@
 
 #include <shogun/base/SGObject.h>
 #include <shogun/features/Labels.h>
-#include <shogun/features/RejectionStrategy.h>
+#include <shogun/multiclass/RejectionStrategy.h>
 
 namespace shogun
 {

diff --git a/src/shogun/features/RejectionStrategy.h → src/shogun/multiclass/RejectionStrategy.h b/src/shogun/features/RejectionStrategy.h → src/shogun/multiclass/RejectionStrategy.h