Skip to content

Commit

Permalink
minor: changed prior of tau for adaptive case
Browse files Browse the repository at this point in the history
  • Loading branch information
mrava87 committed Aug 20, 2022
1 parent 13723bb commit 18504e4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pyproximal/optimization/primal.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ def ProximalGradient(proxf, proxg, x0, tau=None, beta=0.5,
\nabla f(\mathbf{y})^T (\mathbf{x} - \mathbf{y}) +
1/(2\tau)||\mathbf{x} - \mathbf{y}||_2^2`.
Different accellerations are provided:
Different accelerations are provided:
- ``acceleration=None``: :math:`\omega^k = 0`;
- `acceleration=vandenberghe`` [1]_: :math:`\omega^k = k / (k + 3)` for `
Expand Down Expand Up @@ -210,10 +210,10 @@ def ProximalGradient(proxf, proxg, x0, tau=None, beta=0.5,
'---------------------------------------------------------\n'
'Proximal operator (f): %s\n'
'Proximal operator (g): %s\n'
'tau = %10e\tbeta=%10e\n'
'tau = %s\tbeta=%10e\n'
'epsg = %s\tniter = %d\t'
'niterback = %d\n' % (type(proxf), type(proxg),
0 if tau is None else tau, beta,
'Adaptive' if tau is None else str(tau), beta,
epsg_print, niter, niterback))
head = ' Itn x[0] f g J=f+eps*g'
print(head)
Expand Down

0 comments on commit 18504e4

Please sign in to comment.