Plif fixes

shogun-toolbox · Aug 25, 2011 · 420fce1 · 420fce1
1 parent e4ca15d
commit 420fce1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/src/shogun/structure/Plif.h b/src/shogun/structure/Plif.h
@@ -250,16 +250,13 @@ class CPlif: public CPlifBase
 		/** set plif_limits
 		 *
 		 * @param p_limits limit
-		 * @param p_len len
 		 */
-		void set_plif_limits(float64_t *p_limits, int32_t p_len)
+		void set_plif_limits(SGVector<float64_t> p_limits)
 		{
-			if (len!=p_len)
-				SG_PRINT("len=%i p_len=%i\n", len, p_len) ;
-			ASSERT(len==p_len);
+			ASSERT(len==p_limits.vlen);
 
 			for (int32_t i=0; i<len; i++)
-				limits[i]=p_limits[i];
+				limits[i]=p_limits.vector[i];
 
 			invalidate_cache();
 			penalty_clear_derivative();
@@ -269,14 +266,13 @@ class CPlif: public CPlifBase
 		/** set plif penalty
 		 *
 		 * @param p_penalties penalties
-		 * @param p_len len
 		 */
-		void set_plif_penalty(float64_t* p_penalties, int32_t p_len)
+		void set_plif_penalty(SGVector<float64_t> p_penalties)
 		{
-			ASSERT(len==p_len);
+			ASSERT(len==p_penalties.vlen);
 
 			for (int32_t i=0; i<len; i++)
-				penalties[i]=p_penalties[i];
+				penalties[i]=p_penalties.vector[i];
 
 			invalidate_cache();
 			penalty_clear_derivative();

diff --git a/src/shogun/structure/PlifMatrix.cpp b/src/shogun/structure/PlifMatrix.cpp
@@ -116,7 +116,7 @@ void CPlifMatrix::set_plif_limits(SGMatrix<float64_t> limits)
 			lim[k] = limits.matrix[i*m_num_limits+k];
 
 		int32_t id=get_plif_id(i);
-		m_PEN[id]->set_plif_limits(lim, m_num_limits);
+		m_PEN[id]->set_plif_limits(SGVector<float64_t>(lim, m_num_limits));
 	}
 	SG_FREE(lim);
 }
@@ -137,7 +137,7 @@ void CPlifMatrix::set_plif_penalties(SGMatrix<float64_t> penalties)
 			pen[k] = penalties.matrix[i*m_num_limits+k];
 
 		int32_t id=get_plif_id(i);
-		m_PEN[id]->set_plif_penalty(pen, m_num_limits);
+		m_PEN[id]->set_plif_penalty(SGVector<float64_t>(pen, m_num_limits));
 	}
 	SG_FREE(pen);
 }