fix compile error due to so -> structure rename

shogun-toolbox · Jun 19, 2012 · c000355 · c000355
1 parent c16fde6
commit c000355
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/src/shogun/so/DualLibQPBMSOSVM.cpp → src/shogun/structure/DualLibQPBMSOSVM.cpp b/src/shogun/so/DualLibQPBMSOSVM.cpp → src/shogun/structure/DualLibQPBMSOSVM.cpp
@@ -8,8 +8,8 @@
  * Copyright (C) 2012 Michal Uricar
  */
 
-#include <shogun/so/DualLibQPBMSOSVM.h>
-#include <shogun/so/libbmrm.h>
+#include <shogun/structure/DualLibQPBMSOSVM.h>
+#include <shogun/structure/libbmrm.h>
 
 using namespace shogun;
 
@@ -22,7 +22,7 @@ CDualLibQPBMSOSVM::CDualLibQPBMSOSVM(
 		CStructuredModel* 	model,
 		CLossFunction* 		loss,
 		CStructuredLabels*	labs,
-		CFeatures*			features,
+		CDotFeatures*			features,
 		float64_t           lambda)
 :CLinearStructuredOutputMachine(model, loss, labs, features)
 {

diff --git a/src/shogun/so/DualLibQPBMSOSVM.h → src/shogun/structure/DualLibQPBMSOSVM.h b/src/shogun/so/DualLibQPBMSOSVM.h → src/shogun/structure/DualLibQPBMSOSVM.h
@@ -12,7 +12,7 @@
 #define _DUALLIBQPBMSOSVM__H__
 
 #include <shogun/machine/LinearStructuredOutputMachine.h>
-#include <shogun/so/RiskFunction.h>
+#include <shogun/structure/RiskFunction.h>
 
 namespace shogun
 {
@@ -26,7 +26,7 @@ class CDualLibQPBMSOSVM : public CLinearStructuredOutputMachine
 		/** standard constructor
 		 *
 		 */
-		CDualLibQPBMSOSVM(CStructuredModel* model, CLossFunction* loss, CStructuredLabels* labs, CFeatures* features, float64_t lambda);
+		CDualLibQPBMSOSVM(CStructuredModel* model, CLossFunction* loss, CStructuredLabels* labs, CDotFeatures* features, float64_t lambda);
 
 		/** destructor */
 		~CDualLibQPBMSOSVM();

diff --git a/src/shogun/so/RiskFunction.cpp → src/shogun/structure/RiskFunction.cpp b/src/shogun/so/RiskFunction.cpp → src/shogun/structure/RiskFunction.cpp
@@ -8,7 +8,7 @@
  * Copyright (C) 2012 Michal Uricar
  */
 
-#include <shogun/so/RiskFunction.h>
+#include <shogun/structure/RiskFunction.h>
 
 using namespace shogun;
 

diff --git a/src/shogun/so/RiskFunction.h → src/shogun/structure/RiskFunction.h b/src/shogun/so/RiskFunction.h → src/shogun/structure/RiskFunction.h
diff --git a/src/shogun/so/libbmrm.cpp → src/shogun/structure/libbmrm.cpp b/src/shogun/so/libbmrm.cpp → src/shogun/structure/libbmrm.cpp
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <math.h>
 
-#include <shogun/so/libbmrm.h>
+#include <shogun/structure/libbmrm.h>
 #include <shogun/lib/external/libqp.h>
 
 namespace shogun

diff --git a/src/shogun/so/libbmrm.h → src/shogun/structure/libbmrm.h b/src/shogun/so/libbmrm.h → src/shogun/structure/libbmrm.h
@@ -12,7 +12,7 @@
  *--------------------------------------------------------------------- */
 
 #include <shogun/lib/common.h>
-#include <shogun/so/RiskFunction.h>
+#include <shogun/structure/RiskFunction.h>
 
 #ifndef libbmrm_h
 #define libbmrm_h