Fixes for WDSVMOcas

shogun-toolbox · May 22, 2012 · 4d58627 · 4d58627
1 parent 3f690ca
commit 4d58627
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/src/shogun/classifier/svm/WDSVMOcas.cpp b/src/shogun/classifier/svm/WDSVMOcas.cpp
@@ -97,7 +97,19 @@ CWDSVMOcas::~CWDSVMOcas()
 {
 }
 
-CLabels* CWDSVMOcas::apply(CFeatures* data)
+CBinaryLabels* CWDSVMOcas::apply_binary(CFeatures* data)
+{
+	SGVector<float64_t> outputs = apply_get_outputs(data);
+	return new CBinaryLabels(outputs);
+}
+
+CRegressionLabels* CWDSVMOcas::apply_regression(CFeatures* data)
+{
+	SGVector<float64_t> outputs = apply_get_outputs(data);
+	return new CRegressionLabels(outputs);
+}
+
+SGVector<float64_t> CWDSVMOcas::apply_get_outputs(CFeatures* data)
 {
 	if (data)
 	{
@@ -114,21 +126,19 @@ CLabels* CWDSVMOcas::apply(CFeatures* data)
 	set_wd_weights();
 	set_normalization_const();
 
+	SGVector<float64_t> outputs;
 	if (features)
 	{
 		int32_t num=features->get_num_vectors();
 		ASSERT(num>0);
 
-		CBinaryLabels* output=new CBinaryLabels(num);
-		SG_REF(output);
+		outputs = SGVector<float64_t>(num);
 
 		for (int32_t i=0; i<num; i++)
-			output->set_label(i, apply_one(i));
-
-		return output;
+			outputs[i] = apply_one(i);
 	}
 
-	return NULL;
+	return outputs;
 }
 
 int32_t CWDSVMOcas::set_wd_weights()

diff --git a/src/shogun/classifier/svm/WDSVMOcas.h b/src/shogun/classifier/svm/WDSVMOcas.h
@@ -151,11 +151,20 @@ class CWDSVMOcas : public CMachine
 		inline int32_t get_degree() { return degree; }
 
 		/** classify objects
+		 * for binary classification problems
 		 *
 		 * @param data (test)data to be classified
 		 * @return classified labels
 		 */
-		virtual CLabels* apply(CFeatures* data=NULL);
+		virtual CBinaryLabels* apply_binary(CFeatures* data=NULL);
+
+		/** classify objects
+		 * for regression problems
+		 *
+		 * @param data (test)data to be classified
+		 * @return classified labels
+		 */
+		virtual CRegressionLabels* apply_regression(CFeatures* data=NULL);
 
 		/** classify one example
 		 *
@@ -210,6 +219,9 @@ class CWDSVMOcas : public CMachine
 
 
 	protected:
+
+		SGVector<float64_t> apply_get_outputs(CFeatures* data);
+
 		/** set wd weights
 		 *
 		 * @return w_dim_single_c