Updated set_weights method

shogun-toolbox · Mar 20, 2012 · df1b927 · df1b927
1 parent 9fbbb9c
commit df1b927
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/shogun/kernel/WeightedCommWordStringKernel.cpp b/src/shogun/kernel/WeightedCommWordStringKernel.cpp
@@ -82,14 +82,14 @@ bool CWeightedCommWordStringKernel::set_wd_weights()
 	return weights!=NULL;
 }
 
-bool CWeightedCommWordStringKernel::set_weights(float64_t* w, int32_t d)
+bool CWeightedCommWordStringKernel::set_weights(SGVector<float64_t> w)
 {
-	ASSERT(d==degree);
+	ASSERT(w.vlen==degree);
 
 	SG_FREE(weights);
-	weights=SG_MALLOC(float64_t, degree);
+	weights = w.vector;
 	for (int32_t i=0; i<degree; i++)
-		weights[i]=CMath::sqrt(w[i]);
+		weights[i]=CMath::sqrt(weights[i]);
 	return true;
 }
 

diff --git a/src/shogun/kernel/WeightedCommWordStringKernel.h b/src/shogun/kernel/WeightedCommWordStringKernel.h
@@ -109,11 +109,10 @@ class CWeightedCommWordStringKernel: public CCommWordStringKernel
 
 		/** set custom weights (swig compatible)
 		 *
-		 * @param w weights
-		 * @param d degree (must match number of weights)
-		 * @return if setting was successful
+		 * @param weights weights
+		 * @return true if setting was successful
 		 */
-		bool set_weights(float64_t* w, int32_t d);
+		bool set_weights(SGVector<float64_t> weights);
 
 		/** return what type of kernel we are
 		 *