Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/epfl-lts2/unlocbox
Browse files Browse the repository at this point in the history
  • Loading branch information
Nathanael Perraudin committed Dec 29, 2015
2 parents 0f21014 + c9e92b0 commit 65fa098
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion prox/prox_tv1d.m
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
else
% c2)
if umax > 0
for jj = k0:kminus
for jj = k0:kplus
sol(jj,ii) = vmax;
end
k = kplus + 1; k0 = kplus + 1; kplus = kplus + 1;
Expand Down

0 comments on commit 65fa098

Please sign in to comment.