rename apply(idx) -> apply_one(idx)

shogun-toolbox · May 21, 2012 · 1a6ae98 · 1a6ae98
1 parent c54276b
commit 1a6ae98
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/shogun/multiclass/ConjugateIndex.cpp b/src/shogun/multiclass/ConjugateIndex.cpp
@@ -159,7 +159,7 @@ CLabels* CConjugateIndex::apply(CFeatures* data)
 	for (int32_t i=0; i<num_vectors;i++)
 	{
 		SG_PROGRESS(i,0,num_vectors-1);
-		predicted_labels->set_label(i,apply(i));
+		predicted_labels->set_label(i,apply_one(i));
 	}
 	SG_DONE();
 
@@ -183,7 +183,7 @@ float64_t CConjugateIndex::conjugate_index(SGVector<float64_t> feature_vector, i
 	return product/norm;
 };
 
-float64_t CConjugateIndex::apply(int32_t index)
+float64_t CConjugateIndex::apply_one(int32_t index)
 {
 	int32_t predicted_label = 0;
 	float64_t max_conjugate_index = 0.0;

diff --git a/src/shogun/multiclass/ConjugateIndex.h b/src/shogun/multiclass/ConjugateIndex.h
@@ -77,7 +77,7 @@ class CConjugateIndex : public CMachine
 	 * @param idx example index
 	 * @return label
 	 */
-	virtual float64_t apply(int32_t idx);
+	virtual float64_t apply_one(int32_t idx);
 
 	/** get name
 	 * @return classifier name

diff --git a/src/shogun/multiclass/KNN.h b/src/shogun/multiclass/KNN.h
@@ -82,7 +82,7 @@ class CKNN : public CDistanceMachine
 		virtual CLabels* apply(CFeatures* data=NULL);
 
 		/// get output for example "vec_idx"
-		virtual float64_t apply(int32_t vec_idx)
+		virtual float64_t apply_one(int32_t vec_idx)
 		{
 			SG_ERROR( "for performance reasons use apply() instead of apply(int32_t vec_idx)\n");
 			return 0;