Transitioned copy feature matrix routine to SGMatrix

shogun-toolbox · Aug 31, 2011 · b5f27b9 · b5f27b9
1 parent 419a67b
commit b5f27b9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/shogun/clustering/KMeans.cpp b/src/shogun/clustering/KMeans.cpp
@@ -200,7 +200,7 @@ void CKMeans::clustknb(bool use_old_mus, float64_t *mus_start)
 		ASSERT(mus_start);
 
 		/// set rhs to mus_start
-		rhs_mus->copy_feature_matrix(mus_start,dimensions,k);
+		rhs_mus->copy_feature_matrix(SGMatrix<float64_t>(mus_start,dimensions,k));
 		float64_t* p_dists=dists;
 
 		for(int32_t idx=0;idx<XSize;idx++,p_dists+=k)
@@ -292,7 +292,7 @@ void CKMeans::clustknb(bool use_old_mus, float64_t *mus_start)
 		}
 #endif
 		///update rhs
-		rhs_mus->copy_feature_matrix(mus.matrix,dimensions,k);
+		rhs_mus->copy_feature_matrix(mus);
 
 		for (i=0; i<XSize; i++)
 		{

diff --git a/src/shogun/features/SimpleFeatures.h b/src/shogun/features/SimpleFeatures.h
@@ -75,8 +75,9 @@ template<class ST> class CSimpleFeatures: public CDotFeatures
 	CSimpleFeatures(const CSimpleFeatures & orig) :
 			CDotFeatures(orig)
 	{
-		copy_feature_matrix(orig.feature_matrix, orig.num_features,
-				orig.num_vectors);
+		copy_feature_matrix(SGMatrix<ST>(orig.feature_matrix,
+		                                 orig.num_features,
+		                                 orig.num_vectors));
 		initialize_cache();
 		m_subset=orig.m_subset->duplicate();
 	}
@@ -554,21 +555,20 @@ template<class ST> class CSimpleFeatures: public CDotFeatures
 	 * not possible with subset
 	 *
 	 * @param src feature matrix to copy
-	 * @param num_feat number of features in matrix
-	 * @param num_vec number of vectors in matrix
 	 */
-	virtual void copy_feature_matrix(ST* src, int32_t num_feat,
-			int32_t num_vec)
+	virtual void copy_feature_matrix(SGMatrix<ST> src)
 	{
 		if (m_subset)
 			SG_ERROR("A subset is set, cannot call copy_feature_matrix\n");
 
 		free_feature_matrix();
+		int32_t num_feat = src.num_rows;
+		int32_t num_vec = src.num_cols;
 		feature_matrix = SG_MALLOC(ST, ((int64_t) num_feat) * num_vec);
-		feature_matrix_num_features=num_feat;
+		feature_matrix_num_features = num_feat;
 		feature_matrix_num_vectors = num_vec;
 
-		memcpy(feature_matrix, src,
+		memcpy(feature_matrix, src.matrix,
 				(sizeof(ST) * ((int64_t) num_feat) * num_vec));
 
 		num_features = num_feat;