SGVector fix for WD-kernel constructor

shogun-toolbox · Apr 17, 2012 · 2649a77 · 2649a77
1 parent 8436b0a
commit 2649a77
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/shogun/kernel/WeightedDegreePositionStringKernel.cpp b/src/shogun/kernel/WeightedDegreePositionStringKernel.cpp
@@ -1858,7 +1858,7 @@ void CWeightedDegreePositionStringKernel::compute_POIM2(
 	SG_FREE(sv_idx);
 }
 
-SGMatrix<float64_t> CWeightedDegreePositionStringKernel::get_POIM2()
+SGVector<float64_t> CWeightedDegreePositionStringKernel::get_POIM2()
 {
 	SGVector<float64_t> poim(m_poim, m_poim_result_len);
 	return poim;

diff --git a/src/shogun/kernel/WeightedDegreeStringKernel.cpp b/src/shogun/kernel/WeightedDegreeStringKernel.cpp
@@ -65,21 +65,22 @@ CWeightedDegreeStringKernel::CWeightedDegreeStringKernel (
 		set_wd_weights_by_type(type);
 }
 
-CWeightedDegreeStringKernel::CWeightedDegreeStringKernel (
-	float64_t *w, int32_t d)
+CWeightedDegreeStringKernel::CWeightedDegreeStringKernel(SGVector<float64_t> w)
 : CStringKernel<char>(10)
 {
 	init();
 
 	type=E_EXTERNAL;
-	degree=d;
+	degree=w.vlen;
 
 	weights=SG_MALLOC(float64_t, degree*(1+max_mismatch));
 	weights_degree=degree;
 	weights_length=(1+max_mismatch);
 
 	for (int32_t i=0; i<degree*(1+max_mismatch); i++)
-		weights[i]=w[i];
+		weights[i]=w.vector[i];
+
+	w.free_vector();
 }
 
 CWeightedDegreeStringKernel::CWeightedDegreeStringKernel(

diff --git a/src/shogun/kernel/WeightedDegreeStringKernel.h b/src/shogun/kernel/WeightedDegreeStringKernel.h
@@ -70,9 +70,8 @@ class CWeightedDegreeStringKernel: public CStringKernel<char>
 		/** constructor
 		 *
 		 * @param weights kernel's weights
-		 * @param degree degree
 		 */
-		CWeightedDegreeStringKernel(float64_t* weights, int32_t degree);
+		CWeightedDegreeStringKernel(SGVector<float64_t> weights);
 
 		/** constructor
 		 *

diff --git a/src/shogun/ui/GUIKernel.cpp b/src/shogun/ui/GUIKernel.cpp
@@ -254,7 +254,7 @@ CKernel* CGUIKernel::create_weighteddegreestring(
 		}
 	}
 
-	CKernel* kern=new CWeightedDegreeStringKernel(weights, order);
+	CKernel* kern=new CWeightedDegreeStringKernel(SGVector<float64_t>(weights, order));
 
 	SG_DEBUG("created WeightedDegreeStringKernel (%p) with size %d, order %d, "
 			"max_mismatch %d, use_normalization %d, mkl_stepsize %d, "