diff options
author | Koray Kavukcuoglu <koray@kavukcuoglu.org> | 2012-04-09 18:19:01 +0400 |
---|---|---|
committer | Koray Kavukcuoglu <koray@kavukcuoglu.org> | 2012-04-09 18:19:01 +0400 |
commit | d87a356f1f8d78f213719c2a13348883b790cbfe (patch) | |
tree | 4570fee26e601f8bdfbbb35eaab0561374858e66 /fista.lua | |
parent | af1f287eb03ae9b07e4e7640cf16bdc7e4570637 (diff) |
make fista exactly compatible to lush version
Diffstat (limited to 'fista.lua')
-rw-r--r-- | fista.lua | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -166,11 +166,13 @@ function optim.FistaLS(f, g, pl, xinit, params) -- are we done? if niter > 1 and math.abs(history[niter].F - history[niter-1].F) <= errthres then converged = true - return xk,history + xinit:copy(y) + return y,history end if niter >= maxiter then - return xk,history + xinit:copy(y) + return y,history end --if niter > 1 and history[niter].F > history[niter-1].F then |