Moved GNB to multiclass folder

shogun-toolbox · May 21, 2012 · e8a662e · e8a662e
1 parent ad7e86b
commit e8a662e
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 4 deletions.
diff --git a/src/interfaces/modular/Classifier.i b/src/interfaces/modular/Classifier.i
@@ -19,7 +19,6 @@
 %rename(KernelMachine) CKernelMachine;
 %rename(GNPPSVM) CGNPPSVM;
 %rename(GPBTSVM) CGPBTSVM;
-%rename(GaussianNaiveBayes) CGaussianNaiveBayes;
 %rename(LDA) CLDA;
 %rename(QDA) CQDA;
 %rename(LibLinear) CLibLinear;
@@ -69,7 +68,6 @@
 %include <shogun/classifier/svm/SVM.h>
 %include <shogun/machine/LinearMachine.h>
 %include <shogun/machine/OnlineLinearMachine.h>
-%include <shogun/classifier/GaussianNaiveBayes.h>
 %include <shogun/classifier/svm/GNPPSVM.h>
 %include <shogun/classifier/svm/GPBTSVM.h>
 %include <shogun/classifier/LDA.h>

diff --git a/src/interfaces/modular/Classifier_includes.i b/src/interfaces/modular/Classifier_includes.i
@@ -21,7 +21,6 @@
  #include <shogun/classifier/svm/SubGradientSVM.h>
  #include <shogun/classifier/svm/SVM.h>
  #include <shogun/classifier/svm/SVMLin.h>
- #include <shogun/classifier/GaussianNaiveBayes.h>
  #include <shogun/machine/KernelMachine.h>
  #include <shogun/classifier/svm/SVMOcas.h>
  #include <shogun/classifier/svm/SVMSGD.h>

diff --git a/src/interfaces/modular/Multiclass.i b/src/interfaces/modular/Multiclass.i
@@ -45,6 +45,7 @@
 %rename(GMNPSVM) CGMNPSVM;
 %rename(KNN) CKNN;
 %rename(ConjugateIndex) CConjugateIndex;
+%rename(GaussianNaiveBayes) CGaussianNaiveBayes;
 
 /* Include Class Headers to make them visible from within the target language */
 %include <shogun/multiclass/RejectionStrategy.h>
@@ -82,4 +83,5 @@
 %include <shogun/multiclass/GMNPSVM.h>
 %include <shogun/multiclass/KNN.h>
 %include <shogun/multiclass/ConjugateIndex.h>
+%include <shogun/multiclass/GaussianNaiveBayes.h>
 
diff --git a/src/interfaces/modular/Multiclass_includes.i b/src/interfaces/modular/Multiclass_includes.i
@@ -34,4 +34,5 @@
  #include <shogun/multiclass/ScatterSVM.h>
  #include <shogun/multiclass/KNN.h>
  #include <shogun/multiclass/ConjugateIndex.h>
+ #include <shogun/multiclass/GaussianNaiveBayes.h>
 %}
diff --git a/src/shogun/classifier/GaussianNaiveBayes.cpp → src/shogun/multiclass/GaussianNaiveBayes.cpp b/src/shogun/classifier/GaussianNaiveBayes.cpp → src/shogun/multiclass/GaussianNaiveBayes.cpp
@@ -8,7 +8,7 @@
  * Copyright (C) 2011 Berlin Institute of Technology and Max-Planck-Society
  */
 
-#include <shogun/classifier/GaussianNaiveBayes.h>
+#include <shogun/multiclass/GaussianNaiveBayes.h>
 #include <shogun/machine/Machine.h>
 #include <shogun/features/Features.h>
 #include <shogun/labels/Labels.h>

diff --git a/src/shogun/classifier/GaussianNaiveBayes.h → src/shogun/multiclass/GaussianNaiveBayes.h b/src/shogun/classifier/GaussianNaiveBayes.h → src/shogun/multiclass/GaussianNaiveBayes.h