fixed merge conflict on BPGLVM

This commit is contained in:
Nicolo Fusi 2013-04-12 13:35:00 +01:00
commit a42d84274d
10 changed files with 367 additions and 67 deletions

View file

@ -104,7 +104,8 @@ def SCG(f, gradf, x, optargs=(), maxiters=500, max_f_eval=500, display=True, xto
iteration += 1
if display:
print 'Iteration:', iteration, ' Objective:', fnow, ' Scale:', beta, '\r',
print 'Iteration: {0:<5g} Objective:{1:< 12g} Scale:{2:< 12g}\r'.format(iteration, fnow, beta),
# print 'Iteration:', iteration, ' Objective:', fnow, ' Scale:', beta, '\r',
sys.stdout.flush()
if success: