apunkt/GPy
1
0
Fork 0
mirror of https://github.com/SheffieldML/GPy.git synced 2026-05-05 09:42:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'devel' of github.com:SheffieldML/GPy into devel

Browse source
This commit is contained in:
Nicolo Fusi 2013-05-17 16:29:55 +01:00
commit 7f632cfc2d
7 changed files with 130 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

6
GPy/inference/SCG.py
View file

@ -36,7 +36,8 @@ def SCG(f, gradf, x, optargs=(), maxiters=500, max_f_eval=500, display=True, xto
Returns
x the optimal value for x
flog : a list of all the objective values
function_eval number of fn evaluations
status: string describing convergence status
"""
if xtol is None:
xtol = 1e-6
@ -153,5 +154,6 @@ def SCG(f, gradf, x, optargs=(), maxiters=500, max_f_eval=500, display=True, xto
# iterations.
status = "maxiter exceeded"
print ""
if display:
print ""
return x, flog, function_eval, status