Moved some libraries to separate folder

shogun-toolbox · Apr 14, 2012 · ad2707e · ad2707e
1 parent c12e96c
commit ad2707e
Show file tree

Hide file tree

Showing 24 changed files with 19 additions and 20 deletions.
diff --git a/src/shogun/classifier/svm/GPBTSVM.h b/src/shogun/classifier/svm/GPBTSVM.h
@@ -12,7 +12,7 @@
 #define _GPBTSVM_H___
 #include <shogun/lib/common.h>
 #include <shogun/classifier/svm/SVM.h>
-#include <shogun/classifier/svm/SVM_libsvm.h>
+#include <shogun/lib/external/shogun_libsvm.h>
 
 #include <stdio.h>
 

diff --git a/src/shogun/classifier/svm/LibLinear.cpp b/src/shogun/classifier/svm/LibLinear.cpp
@@ -16,7 +16,7 @@
 #include <shogun/lib/Time.h>
 #include <shogun/base/Parameter.h>
 #include <shogun/classifier/svm/LibLinear.h>
-#include <shogun/classifier/svm/SVM_linear.h>
+#include <shogun/lib/external/shogun_liblinear.h>
 #include <shogun/classifier/svm/Tron.h>
 #include <shogun/features/DotFeatures.h>
 

diff --git a/src/shogun/classifier/svm/LibLinear.h b/src/shogun/classifier/svm/LibLinear.h
@@ -17,7 +17,7 @@
 #include <shogun/lib/common.h>
 #include <shogun/base/Parameter.h>
 #include <shogun/machine/LinearMachine.h>
-#include <shogun/classifier/svm/SVM_linear.h>
+#include <shogun/lib/external/shogun_liblinear.h>
 
 namespace shogun
 {

diff --git a/src/shogun/classifier/svm/LibSVM.h b/src/shogun/classifier/svm/LibSVM.h
@@ -13,7 +13,7 @@
 
 #include <shogun/lib/common.h>
 #include <shogun/classifier/svm/SVM.h>
-#include <shogun/classifier/svm/SVM_libsvm.h>
+#include <shogun/lib/external/shogun_libsvm.h>
 
 namespace shogun
 {

diff --git a/src/shogun/classifier/svm/LibSVMMultiClass.h b/src/shogun/classifier/svm/LibSVMMultiClass.h
@@ -13,7 +13,7 @@
 
 #include <shogun/lib/common.h>
 #include <shogun/classifier/svm/MultiClassSVM.h>
-#include <shogun/classifier/svm/SVM_libsvm.h>
+#include <shogun/lib/external/shogun_libsvm.h>
 #include <shogun/classifier/svm/LibSVM.h>
 
 namespace shogun

diff --git a/src/shogun/classifier/svm/LibSVMOneClass.h b/src/shogun/classifier/svm/LibSVMOneClass.h
@@ -13,7 +13,7 @@
 #define _LIBSVM_ONECLASS_H___
 #include <shogun/lib/common.h>
 #include <shogun/classifier/svm/SVM.h>
-#include <shogun/classifier/svm/SVM_libsvm.h>
+#include <shogun/lib/external/shogun_libsvm.h>
 
 #include <stdio.h>
 

diff --git a/src/shogun/classifier/svm/SVMOcas.h b/src/shogun/classifier/svm/SVMOcas.h
@@ -14,7 +14,7 @@
 
 #include <shogun/lib/common.h>
 #include <shogun/machine/LinearMachine.h>
-#include <shogun/classifier/svm/libocas.h>
+#include <shogun/lib/external/libocas.h>
 #include <shogun/features/DotFeatures.h>
 #include <shogun/features/Labels.h>
 

diff --git a/src/shogun/classifier/svm/ScatterSVM.h b/src/shogun/classifier/svm/ScatterSVM.h
@@ -15,7 +15,7 @@
 #include <shogun/lib/common.h>
 #include <shogun/lib/config.h>
 #include <shogun/classifier/svm/MultiClassSVM.h>
-#include <shogun/classifier/svm/SVM_libsvm.h>
+#include <shogun/lib/external/shogun_libsvm.h>
 
 #include <stdio.h>
 

diff --git a/src/shogun/classifier/svm/WDSVMOcas.cpp b/src/shogun/classifier/svm/WDSVMOcas.cpp
@@ -15,7 +15,7 @@
 #include <shogun/lib/Time.h>
 #include <shogun/base/Parallel.h>
 #include <shogun/machine/Machine.h>
-#include <shogun/classifier/svm/libocas.h>
+#include <shogun/lib/external/libocas.h>
 #include <shogun/classifier/svm/WDSVMOcas.h>
 #include <shogun/features/StringFeatures.h>
 #include <shogun/features/Alphabet.h>

diff --git a/src/shogun/classifier/svm/libocas.cpp → src/shogun/lib/external/libocas.cpp b/src/shogun/classifier/svm/libocas.cpp → src/shogun/lib/external/libocas.cpp
@@ -19,9 +19,9 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include <shogun/classifier/svm/libocas.h>
-#include <shogun/classifier/svm/libocas_common.h>
-#include <shogun/classifier/svm/libqp.h>
+#include <shogun/lib/external/libocas.h>
+#include <shogun/lib/external/libocas_common.h>
+#include <shogun/lib/external/libqp.h>
 
 namespace shogun
 {

diff --git a/src/shogun/classifier/svm/libocas.h → src/shogun/lib/external/libocas.h b/src/shogun/classifier/svm/libocas.h → src/shogun/lib/external/libocas.h
diff --git a/src/shogun/classifier/svm/libocas_common.h → src/shogun/lib/external/libocas_common.h b/src/shogun/classifier/svm/libocas_common.h → src/shogun/lib/external/libocas_common.h
diff --git a/src/shogun/classifier/svm/libqp.h → src/shogun/lib/external/libqp.h b/src/shogun/classifier/svm/libqp.h → src/shogun/lib/external/libqp.h
diff --git a/src/shogun/classifier/svm/libqp_splx.cpp → src/shogun/lib/external/libqp_splx.cpp b/src/shogun/classifier/svm/libqp_splx.cpp → src/shogun/lib/external/libqp_splx.cpp
@@ -76,7 +76,7 @@
 #include <limits.h>
 
 #include <shogun/lib/common.h>
-#include <shogun/classifier/svm/libqp.h>
+#include <shogun/lib/external/libqp.h>
 namespace shogun
 {
 

diff --git a/src/shogun/classifier/svm/SVM_linear.cpp → src/shogun/lib/external/shogun_liblinear.cpp b/src/shogun/classifier/svm/SVM_linear.cpp → src/shogun/lib/external/shogun_liblinear.cpp
@@ -40,7 +40,7 @@
 #include <stdarg.h>
 
 #include <shogun/mathematics/Math.h>
-#include <shogun/classifier/svm/SVM_linear.h>
+#include <shogun/lib/external/shogun_liblinear.h>
 #include <shogun/classifier/svm/Tron.h>
 #include <shogun/lib/Time.h>
 

diff --git a/src/shogun/classifier/svm/SVM_linear.h → src/shogun/lib/external/shogun_liblinear.h b/src/shogun/classifier/svm/SVM_linear.h → src/shogun/lib/external/shogun_liblinear.h
@@ -38,7 +38,7 @@
 #include <shogun/lib/config.h>
 
 #ifdef HAVE_LAPACK
-#include <shogun/classifier/svm/Tron.h>
+#include <shogun/lib/external/tron.h>
 #include <shogun/features/DotFeatures.h>
 #include <vector>
 

diff --git a/src/shogun/classifier/svm/SVM_libsvm.cpp → src/shogun/lib/external/shogun_libsvm.cpp b/src/shogun/classifier/svm/SVM_libsvm.cpp → src/shogun/lib/external/shogun_libsvm.cpp
diff --git a/src/shogun/classifier/svm/SVM_libsvm.h → src/shogun/lib/external/shogun_libsvm.h b/src/shogun/classifier/svm/SVM_libsvm.h → src/shogun/lib/external/shogun_libsvm.h
diff --git a/src/shogun/classifier/svm/Tron.cpp → src/shogun/lib/external/tron.cpp b/src/shogun/classifier/svm/Tron.cpp → src/shogun/lib/external/tron.cpp
@@ -10,7 +10,7 @@
 #ifdef HAVE_LAPACK
 #include <shogun/mathematics/lapack.h>
 #include <shogun/mathematics/Math.h>
-#include <shogun/classifier/svm/Tron.h>
+#include <shogun/lib/external/tron.h>
 
 using namespace shogun;
 

diff --git a/src/shogun/classifier/svm/Tron.h → src/shogun/lib/external/tron.h b/src/shogun/classifier/svm/Tron.h → src/shogun/lib/external/tron.h
diff --git a/src/shogun/multiclass/MulticlassLibLinear.cpp b/src/shogun/multiclass/MulticlassLibLinear.cpp
@@ -11,7 +11,6 @@
 #include <shogun/lib/config.h>
 #ifdef HAVE_LAPACK
 #include <shogun/multiclass/MulticlassLibLinear.h>
-#include <shogun/classifier/svm/SVM_linear.h>
 #include <shogun/mathematics/Math.h>
 #include <shogun/lib/v_array.h>
 

diff --git a/src/shogun/multiclass/MulticlassLibLinear.h b/src/shogun/multiclass/MulticlassLibLinear.h
@@ -15,7 +15,7 @@
 #include <shogun/lib/common.h>
 #include <shogun/features/DotFeatures.h>
 #include <shogun/machine/LinearMulticlassMachine.h>
-#include <shogun/classifier/svm/SVM_linear.h>
+#include <shogun/lib/external/shogun_liblinear.h>
 
 namespace shogun
 {

diff --git a/src/shogun/multiclass/MulticlassOCAS.h b/src/shogun/multiclass/MulticlassOCAS.h
@@ -13,7 +13,7 @@
 
 #include <shogun/lib/common.h>
 #include <shogun/features/DotFeatures.h>
-#include <shogun/classifier/svm/libocas.h>
+#include <shogun/lib/external/libocas.h>
 #include <shogun/machine/LinearMulticlassMachine.h>
 
 namespace shogun

diff --git a/src/shogun/regression/svr/LibSVR.h b/src/shogun/regression/svr/LibSVR.h
@@ -15,7 +15,7 @@
 
 #include <shogun/lib/common.h>
 #include <shogun/classifier/svm/SVM.h>
-#include <shogun/classifier/svm/SVM_libsvm.h>
+#include <shogun/lib/external/shogun_libsvm.h>
 #include <shogun/regression/Regression.h>
 
 namespace shogun