knn and conjugate to multiclass

shogun-toolbox · Apr 23, 2012 · 15afb6f · 15afb6f
1 parent eeaa056
commit 15afb6f
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/src/interfaces/modular/Classifier.i b/src/interfaces/modular/Classifier.i
@@ -20,7 +20,6 @@
 %rename(GNPPSVM) CGNPPSVM;
 %rename(GPBTSVM) CGPBTSVM;
 %rename(GaussianNaiveBayes) CGaussianNaiveBayes;
-%rename(KNN) CKNN;
 %rename(LDA) CLDA;
 %rename(QDA) CQDA;
 %rename(LibLinear) CLibLinear;
@@ -51,7 +50,6 @@
 %rename(MKLClassification) CMKLClassification;
 %rename(MKLOneClass) CMKLOneClass;
 %rename(VowpalWabbit) CVowpalWabbit;
-%rename(ConjugateIndex) CConjugateIndex;
 #ifdef USE_SVMLIGHT
 %rename(SVMLight) CSVMLight;
 %rename(DomainAdaptationSVM) CDomainAdaptationSVM;
@@ -83,7 +81,6 @@
 %include <shogun/classifier/GaussianNaiveBayes.h>
 %include <shogun/classifier/svm/GNPPSVM.h>
 %include <shogun/classifier/svm/GPBTSVM.h>
-%include <shogun/classifier/KNN.h>
 %include <shogun/classifier/LDA.h>
 %include <shogun/classifier/QDA.h>
 %include <shogun/classifier/svm/LibLinear.h>
@@ -109,7 +106,6 @@
 %include <shogun/classifier/mkl/MKLOneClass.h>
 %include <shogun/classifier/vw/VowpalWabbit.h>
 %include <shogun/classifier/svm/DomainAdaptationSVMLinear.h>
-%include <shogun/classifier/ConjugateIndex.h>
 %include <shogun/classifier/svm/NewtonSVM.h>
 
 %include <shogun/multiclass/MulticlassStrategy.h>

diff --git a/src/interfaces/modular/Classifier_includes.i b/src/interfaces/modular/Classifier_includes.i
@@ -3,7 +3,6 @@
  #include <shogun/classifier/svm/GNPPSVM.h>
  #include <shogun/classifier/svm/GPBTSVM.h>
  #include <shogun/machine/DistanceMachine.h>
- #include <shogun/classifier/KNN.h>
  #include <shogun/classifier/LDA.h>
  #include <shogun/classifier/QDA.h>
  #include <shogun/classifier/svm/LibLinear.h>
@@ -33,7 +32,6 @@
  #include <shogun/classifier/mkl/MKLClassification.h>
  #include <shogun/classifier/mkl/MKLOneClass.h>
  #include <shogun/classifier/vw/VowpalWabbit.h>
- #include <shogun/classifier/ConjugateIndex.h>
  #include <shogun/classifier/svm/NewtonSVM.h>
 
  #include <shogun/multiclass/MulticlassStrategy.h>

diff --git a/src/interfaces/modular/Multiclass.i b/src/interfaces/modular/Multiclass.i
@@ -16,6 +16,8 @@
 %rename(LaRank) CLaRank;
 %rename(ScatterSVM) CScatterSVM;
 %rename(GMNPSVM) CGMNPSVM;
+%rename(KNN) CKNN;
+%rename(ConjugateIndex) CConjugateIndex;
 
 /* Include Class Headers to make them visible from within the target language */
 %include <shogun/multiclass/MulticlassLibLinear.h>
@@ -25,4 +27,6 @@
 %include <shogun/multiclass/LaRank.h>
 %include <shogun/multiclass/ScatterSVM.h>
 %include <shogun/multiclass/GMNPSVM.h>
+%include <shogun/multiclass/KNN.h>
+%include <shogun/multiclass/ConjugateIndex.h>
 
diff --git a/src/interfaces/modular/Multiclass_includes.i b/src/interfaces/modular/Multiclass_includes.i
@@ -6,4 +6,6 @@
  #include <shogun/multiclass/MulticlassLibSVM.h>
  #include <shogun/multiclass/GMNPSVM.h>
  #include <shogun/multiclass/ScatterSVM.h>
+ #include <shogun/multiclass/KNN.h>
+ #include <shogun/multiclass/ConjugateIndex.h>
 %}
diff --git a/src/shogun/clustering/GMM.cpp b/src/shogun/clustering/GMM.cpp
@@ -18,7 +18,7 @@
 #include <shogun/mathematics/Math.h>
 #include <shogun/mathematics/lapack.h>
 #include <shogun/features/Labels.h>
-#include <shogun/classifier/KNN.h>
+#include <shogun/multiclass/KNN.h>
 
 using namespace shogun;
 

diff --git a/src/shogun/classifier/ConjugateIndex.cpp → src/shogun/multiclass/ConjugateIndex.cpp b/src/shogun/classifier/ConjugateIndex.cpp → src/shogun/multiclass/ConjugateIndex.cpp
@@ -8,7 +8,7 @@
  * Copyright (C) 2011 Sergey Lisitsyn
  */
 
-#include <shogun/classifier/ConjugateIndex.h>
+#include <shogun/multiclass/ConjugateIndex.h>
 #ifdef HAVE_LAPACK
 #include <shogun/machine/Machine.h>
 #include <shogun/features/Features.h>

diff --git a/src/shogun/classifier/ConjugateIndex.h → src/shogun/multiclass/ConjugateIndex.h b/src/shogun/classifier/ConjugateIndex.h → src/shogun/multiclass/ConjugateIndex.h
diff --git a/src/shogun/classifier/KNN.cpp → src/shogun/multiclass/KNN.cpp b/src/shogun/classifier/KNN.cpp → src/shogun/multiclass/KNN.cpp
@@ -11,7 +11,7 @@
  * Copyright (C) 2011 Berlin Institute of Technology and Max-Planck-Society
  */
 
-#include <shogun/classifier/KNN.h>
+#include <shogun/multiclass/KNN.h>
 #include <shogun/features/Labels.h>
 #include <shogun/mathematics/Math.h>
 #include <shogun/lib/Signal.h>

diff --git a/src/shogun/classifier/KNN.h → src/shogun/multiclass/KNN.h b/src/shogun/classifier/KNN.h → src/shogun/multiclass/KNN.h
diff --git a/src/shogun/ui/GUIClassifier.cpp b/src/shogun/ui/GUIClassifier.cpp
@@ -20,7 +20,7 @@
 
 #include <shogun/kernel/AUCKernel.h>
 
-#include <shogun/classifier/KNN.h>
+#include <shogun/multiclass/KNN.h>
 #include <shogun/clustering/KMeans.h>
 #include <shogun/clustering/Hierarchical.h>
 #include <shogun/classifier/PluginEstimate.h>