Merge pull request #363 from karlnapf/master

fixed warning
shogun-toolbox · Feb 2, 2012 · f0bdba7 · f0bdba7
2 parents 9ee39af + 7083c78
commit f0bdba7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/shogun/modelselection/GridSearchModelSelection.cpp b/src/shogun/modelselection/GridSearchModelSelection.cpp
@@ -34,7 +34,7 @@ CGridSearchModelSelection::~CGridSearchModelSelection()
 {
 }
 
-CParameterCombination* CGridSearchModelSelection::select_model(bool print)
+CParameterCombination* CGridSearchModelSelection::select_model(bool print_state)
 {
 	/* Retrieve all possible parameter combinations */
 	CDynamicObjectArray<CParameterCombination>* combinations=
@@ -57,7 +57,7 @@ CParameterCombination* CGridSearchModelSelection::select_model(bool print)
 		CParameterCombination* current_combination=combinations->get_element(i);
 
 		/* eventually print */
-		if (print)
+		if (print_state)
 		{
 			SG_PRINT("trying combination:\n");
 			current_combination->print_tree();

diff --git a/src/shogun/modelselection/GridSearchModelSelection.h b/src/shogun/modelselection/GridSearchModelSelection.h
@@ -42,10 +42,10 @@ class CGridSearchModelSelection: public CModelSelection
 	/**
 	 * method to select model
 	 *
-	 * @param print if true, the current combination is printed
+	 * @param print_state if true, the current combination is printed
 	 * @return best combination of model parameters
 	 */
-	virtual CParameterCombination* select_model(bool print=false);
+	virtual CParameterCombination* select_model(bool print_state=false);
 
 	/** @return name of the SGSerializable */
 	inline virtual const char* get_name() const

diff --git a/src/shogun/modelselection/ModelSelection.h b/src/shogun/modelselection/ModelSelection.h
@@ -44,10 +44,10 @@ class CModelSelection: public CSGObject
 	/**
 	 * abstract method to select model
 	 *
-	 * @param print if true, the current combination is printed
+	 * @param print_state if true, the current combination is printed
 	 * @return best combination of model parameters
 	 */
-	virtual CParameterCombination* select_model(bool print=false)=0;
+	virtual CParameterCombination* select_model(bool print_state=false)=0;
 
 	/** @return name of the SGSerializable */
 	inline virtual const char* get_name() const	{ return "ModelSelection"; }