DualLibQPBMSOSVM fixes due to changes in libbmrm and RiskFunction

shogun-toolbox · Jun 21, 2012 · d8c48bf · d8c48bf
1 parent 6e12559
commit d8c48bf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/src/shogun/structure/DualLibQPBMSOSVM.cpp b/src/shogun/structure/DualLibQPBMSOSVM.cpp
@@ -22,14 +22,16 @@ CDualLibQPBMSOSVM::CDualLibQPBMSOSVM(
 		CStructuredModel* 	model,
 		CLossFunction* 		loss,
 		CStructuredLabels*	labs,
-		CDotFeatures*			features,
-		float64_t           lambda)
+		CDotFeatures*		features,
+		float64_t           lambda,
+		CRiskFunction*      risk_function)
 :CLinearStructuredOutputMachine(model, loss, labs, features)
 {
 	set_TolRel(0.001);
 	set_TolAbs(0.0);
-	set_BufSize(100);
+	set_BufSize(1000);
 	set_lambda(lambda);
+	m_risk_function=risk_function;
 }
 
 CDualLibQPBMSOSVM::~CDualLibQPBMSOSVM()
@@ -39,12 +41,20 @@ CDualLibQPBMSOSVM::~CDualLibQPBMSOSVM()
 bool CDualLibQPBMSOSVM::train_machine(CFeatures* data)
 {
 	// get dimension of w
-	uint32_t nDim=0;
-	//uint32_t nDim=m_risk_function->get_dim(data);   //TODO: get_dim function accessible trough StructuredModel
+	uint32_t nDim=this->m_model->get_dim();
+
+	// Initialize the weight vector
+	m_w = SGVector< float64_t >(nDim);
+	m_w.zero();
+
+	bmrm_data_T bmrm_data;
+	bmrm_data.X=this->m_features;
+	bmrm_data.y=this->m_labels;
+	bmrm_data.w_dim=nDim;
 
 	// call the BMRM solver
-	bmrm_return_value_T result = svm_bmrm_solver(data, m_w.vector, m_TolRel, m_TolAbs, m_lambda,
-			m_BufSize, nDim, m_risk_function);
+	bmrm_return_value_T result = svm_bmrm_solver(&bmrm_data, m_w.vector, m_TolRel, m_TolAbs, m_lambda,
+			m_BufSize, m_risk_function);
 
 	if (result.exitflag==1)
 	{
@@ -53,9 +63,3 @@ bool CDualLibQPBMSOSVM::train_machine(CFeatures* data)
 		return false;
 	}
 }
-
-void CDualLibQPBMSOSVM::register_parameters()
-{
-	SG_ADD(&m_w, "m_w", "Weight vector", MS_NOT_AVAILABLE);
-}
-
diff --git a/src/shogun/structure/DualLibQPBMSOSVM.h b/src/shogun/structure/DualLibQPBMSOSVM.h
@@ -26,7 +26,7 @@ class CDualLibQPBMSOSVM : public CLinearStructuredOutputMachine
 		/** standard constructor
 		 *
 		 */
-		CDualLibQPBMSOSVM(CStructuredModel* model, CLossFunction* loss, CStructuredLabels* labs, CDotFeatures* features, float64_t lambda);
+		CDualLibQPBMSOSVM(CStructuredModel* model, CLossFunction* loss, CStructuredLabels* labs, CDotFeatures* features, float64_t lambda, CRiskFunction* risk_function);
 
 		/** destructor */
 		~CDualLibQPBMSOSVM();
@@ -62,12 +62,6 @@ class CDualLibQPBMSOSVM : public CLinearStructuredOutputMachine
 		bool train_machine(CFeatures* data=NULL);
 
 	private:
-		/** register class parameters */
-		void register_parameters();
-
-	private:
-		/** weight vector */
-		SGVector< float64_t > m_w;
 
 		/** lambda */
 		float64_t m_lambda;