update the comments

shogun-toolbox · Apr 6, 2015 · 58afde5 · 58afde5
1 parent 9dc4ef4
commit 58afde5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/shogun/machine/gp/MultiLaplacianInferenceMethod.cpp b/src/shogun/machine/gp/MultiLaplacianInferenceMethod.cpp
@@ -363,7 +363,9 @@ void CMultiLaplacianInferenceMethod::update_alpha()
 	}
 
 	if (Psi_Old-Psi_New>m_tolerance && iter>=m_iter)
-		SG_WARNING("Max iterations attained but the optimizer is not converged\n");
+	{
+		SG_WARNING("Max iterations (%d) reached, but convergence level (%f) is not yet below tolerance (%f)\n", m_iter, Psi_Old-Psi_New, m_tolerance);
+	}
 }
 
 void CMultiLaplacianInferenceMethod::update_deriv()

diff --git a/src/shogun/machine/gp/SingleFITCLaplacianInferenceMethod.cpp b/src/shogun/machine/gp/SingleFITCLaplacianInferenceMethod.cpp
@@ -425,8 +425,11 @@ void CSingleFITCLaplacianInferenceMethod::update_alpha()
 		float64_t x;
 		Psi_New=local_min(0, m_opt_max, m_opt_tolerance, func, x);
 	}
+
 	if (Psi_Old-Psi_New>m_tolerance && iter>=m_iter)
-		SG_WARNING("Max iterations attained but the optimizer is not converged\n");
+	{
+		SG_WARNING("Max iterations (%d) reached, but convergence level (%f) is not yet below tolerance (%f)\n", m_iter, Psi_Old-Psi_New, m_tolerance);
+	}
 
 	// compute f = K * alpha + m
 	SGVector<float64_t> tmp=compute_mvmK(m_al);

diff --git a/src/shogun/machine/gp/SingleLaplacianInferenceMethod.cpp b/src/shogun/machine/gp/SingleLaplacianInferenceMethod.cpp
@@ -382,8 +382,11 @@ void CSingleLaplacianInferenceMethod::update_alpha()
 		float64_t x;
 		Psi_New=local_min(0, m_opt_max, m_opt_tolerance, func, x);
 	}
+
 	if (Psi_Old-Psi_New>m_tolerance && iter>=m_iter)
-		SG_WARNING("Max iterations attained but the optimizer is not converged\n");
+	{
+		SG_WARNING("Max iterations (%d) reached, but convergence level (%f) is not yet below tolerance (%f)\n", m_iter, Psi_Old-Psi_New, m_tolerance);
+	}
 
 	// compute f = K * alpha + m
 	eigen_mu=eigen_ktrtr*CMath::sq(m_scale)*eigen_alpha+eigen_mean;