move svmlight include next to libsvm

shogun-toolbox · Feb 12, 2014 · 0956191 · 0956191
1 parent a8e168a
commit 0956191
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 24 deletions.
diff --git a/src/interfaces/modular/Classifier.i b/src/interfaces/modular/Classifier.i
@@ -34,6 +34,10 @@
 %rename(LibLinear) CLibLinear;
 %rename(LibSVM) CLibSVM;
 %rename(LibSVMOneClass) CLibSVMOneClass;
+#ifdef USE_SVMLIGHT
+%rename(SVMLight) CSVMLight;
+%rename(SVMLightOneClass) CSVMLightOneClass;
+#endif //USE_SVMLIGHT
 %rename(LinearMachine) CLinearMachine;
 %rename(OnlineLinearMachine) COnlineLinearMachine;
 %rename(LPBoost) CLPBoost;
@@ -57,10 +61,6 @@
 %rename(MKLClassification) CMKLClassification;
 %rename(MKLOneClass) CMKLOneClass;
 %rename(VowpalWabbit) CVowpalWabbit;
-#ifdef USE_SVMLIGHT
-%rename(SVMLight) CSVMLight;
-%rename(SVMLightOneClass) CSVMLightOneClass;
-#endif //USE_SVMLIGHT
 %rename(FeatureBlockLogisticRegression) CFeatureBlockLogisticRegression;
 %rename(DirectorLinearMachine) CDirectorLinearMachine;
 %rename(DirectorKernelMachine) CDirectorKernelMachine;
@@ -86,6 +86,20 @@
 %include <shogun/classifier/svm/LibLinear.h>
 %include <shogun/classifier/svm/LibSVM.h>
 %include <shogun/classifier/svm/LibSVMOneClass.h>
+
+#ifdef USE_SVMLIGHT
+%ignore VERSION;
+%ignore VERSION_DATE;
+%ignore MAXSHRINK;
+%ignore SHRINK_STATE;
+%ignore MODEL;
+%ignore LEARN_PARM;
+%ignore TIMING;
+
+%include <shogun/classifier/svm/SVMLight.h>
+%include <shogun/classifier/svm/SVMLightOneClass.h>
+#endif //USE_SVMLIGHT
+
 %include <shogun/classifier/LPBoost.h>
 %include <shogun/classifier/LPM.h>
 %include <shogun/classifier/svm/MPDSVM.h>
@@ -108,18 +122,3 @@
 %include <shogun/machine/DirectorLinearMachine.h>
 %include <shogun/machine/DirectorKernelMachine.h>
 %include <shogun/machine/BaggingMachine.h>
-
-#ifdef USE_SVMLIGHT
-
-%ignore VERSION;
-%ignore VERSION_DATE;
-%ignore MAXSHRINK;
-%ignore SHRINK_STATE;
-%ignore MODEL;
-%ignore LEARN_PARM;
-%ignore TIMING;
-
-%include <shogun/classifier/svm/SVMLight.h>
-%include <shogun/classifier/svm/SVMLightOneClass.h>
-
-#endif //USE_SVMLIGHT
diff --git a/src/interfaces/modular/Classifier_includes.i b/src/interfaces/modular/Classifier_includes.i
@@ -7,6 +7,10 @@
  #include <shogun/classifier/svm/LibLinear.h>
  #include <shogun/classifier/svm/LibSVM.h>
  #include <shogun/classifier/svm/LibSVMOneClass.h>
+#ifdef USE_SVMLIGHT
+ #include <shogun/classifier/svm/SVMLight.h>
+ #include <shogun/classifier/svm/SVMLightOneClass.h>
+#endif //USE_SVMLIGHT
  #include <shogun/machine/LinearMachine.h>
  #include <shogun/machine/OnlineLinearMachine.h>
  #include <shogun/classifier/LPBoost.h>
@@ -29,11 +33,6 @@
  #include <shogun/classifier/mkl/MKLOneClass.h>
  #include <shogun/classifier/vw/VowpalWabbit.h>
  #include <shogun/classifier/svm/NewtonSVM.h>
-
-#ifdef USE_SVMLIGHT
- #include <shogun/classifier/svm/SVMLight.h>
- #include <shogun/classifier/svm/SVMLightOneClass.h>
-#endif //USE_SVMLIGHT
  #include <shogun/classifier/FeatureBlockLogisticRegression.h>
  #include <shogun/machine/DirectorLinearMachine.h>
  #include <shogun/machine/DirectorKernelMachine.h>