Moved liblinear to optimization

shogun-toolbox · Jul 1, 2012 · c586669 · c586669
1 parent 102ecb0
commit c586669
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 9 deletions.
diff --git a/src/shogun/classifier/svm/LibLinear.cpp b/src/shogun/classifier/svm/LibLinear.cpp
@@ -16,7 +16,6 @@
 #include <shogun/lib/Time.h>
 #include <shogun/base/Parameter.h>
 #include <shogun/classifier/svm/LibLinear.h>
-#include <shogun/lib/external/shogun_liblinear.h>
 #include <shogun/lib/external/tron.h>
 #include <shogun/features/DotFeatures.h>
 #include <shogun/labels/BinaryLabels.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/lib/external/shogun_liblinear.h>
+#include <shogun/optimization/liblinear/shogun_liblinear.h>
 
 namespace shogun
 {

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/lib/external/shogun_liblinear.h>
+#include <shogun/optimization/liblinear/shogun_liblinear.h>
 
 namespace shogun
 {

diff --git a/src/shogun/lib/external/shogun_liblinear.cpp → ...timization/liblinear/shogun_liblinear.cpp b/src/shogun/lib/external/shogun_liblinear.cpp → ...timization/liblinear/shogun_liblinear.cpp
@@ -40,8 +40,8 @@
 #include <stdarg.h>
 
 #include <shogun/mathematics/Math.h>
-#include <shogun/lib/external/shogun_liblinear.h>
-#include <shogun/lib/external/tron.h>
+#include <shogun/optimization/liblinear/shogun_liblinear.h>
+#include <shogun/optimization/liblinear/tron.h>
 #include <shogun/lib/Time.h>
 #include <shogun/lib/Signal.h>
 

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

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

diff --git a/src/shogun/lib/external/tron.h → src/shogun/optimization/liblinear/tron.h b/src/shogun/lib/external/tron.h → src/shogun/optimization/liblinear/tron.h
diff --git a/src/shogun/regression/svr/LibLinearRegression.h b/src/shogun/regression/svr/LibLinearRegression.h
@@ -14,7 +14,7 @@
 #include <shogun/lib/common.h>
 #include <shogun/features/DotFeatures.h>
 #include <shogun/machine/LinearMachine.h>
-#include <shogun/lib/external/shogun_liblinear.h>
+#include <shogun/optimization/liblinear/shogun_liblinear.h>
 
 namespace shogun
 {

diff --git a/src/shogun/transfer/multitask/LibLinearMTL.h b/src/shogun/transfer/multitask/LibLinearMTL.h
@@ -19,7 +19,7 @@
 #include <shogun/lib/common.h>
 #include <shogun/base/Parameter.h>
 #include <shogun/machine/LinearMachine.h>
-#include <shogun/lib/external/shogun_liblinear.h>
+#include <shogun/optimization/liblinear/shogun_liblinear.h>
 #include <shogun/lib/SGSparseMatrix.h>