Merge branch 'mrd' into devel

This commit is contained in:
Max Zwiessele 2013-05-17 12:23:21 +01:00
commit 3bb42481be
3 changed files with 34 additions and 168 deletions

View file

@ -154,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