Changed apply to distance to embed to distance

shogun-toolbox · Oct 23, 2011 · 4e3ea17 · 4e3ea17
1 parent 678d405
commit 4e3ea17
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/shogun/converter/MultidimensionalScaling.cpp b/src/shogun/converter/MultidimensionalScaling.cpp
@@ -111,7 +111,7 @@ const char* CMultidimensionalScaling::get_name() const
 	return "MultidimensionalScaling";
 };
 
-CFeatures* CMultidimensionalScaling::apply(CDistance* distance)
+CSimpleFeatures<float64_t>* CMultidimensionalScaling::embed(CDistance* distance)
 {
 	ASSERT(distance);
 
@@ -125,7 +125,7 @@ CFeatures* CMultidimensionalScaling::apply(CDistance* distance)
 
 	distance_matrix.destroy_matrix();
 
-	return (CFeatures*)(new CSimpleFeatures<float64_t>(feature_matrix));
+	return new CSimpleFeatures<float64_t>(feature_matrix);
 }
 
 SGMatrix<float64_t> CMultidimensionalScaling::process_distance_matrix(SGMatrix<float64_t> distance_matrix)
@@ -139,7 +139,7 @@ CFeatures* CMultidimensionalScaling::apply(CFeatures* features)
 	ASSERT(m_distance);
 
 	m_distance->init(features,features);
-	CFeatures* embedding = apply(m_distance);
+	CSimpleFeatures<float64_t>* embedding = embed(m_distance);
 	m_distance->remove_lhs_and_rhs();
 
 	SG_UNREF(features);

diff --git a/src/shogun/converter/MultidimensionalScaling.h b/src/shogun/converter/MultidimensionalScaling.h
@@ -70,7 +70,7 @@ class CMultidimensionalScaling: public CEmbeddingConverter
 	 * @param distance (should be approximate euclidean for consistent result)
 	 * @return new features with distance similar to given as much as possible
 	 */
-	virtual CFeatures* apply(CDistance* distance);
+	virtual CSimpleFeatures<float64_t>* embed(CDistance* distance);
 
 	/** apply preprocessor to feature matrix,
 	 * changes feature matrix to the one having target dimensionality