Skip to content

Commit

Permalink
Fix Augmented Lagrangian
Browse files Browse the repository at this point in the history
  • Loading branch information
frankong committed Aug 5, 2019
1 parent 375d016 commit a97daf7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions sigpy/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ class LinearLeastSquares(App):
\min_x \frac{1}{2} \| A x - y \|_2^2 + g(G x) +
\frac{\lamda}{2} \| x - z \|_2^2
Three algorithms can be used: :class:`sigpy.alg.ConjugateGradient`,
:class:`sigpy.alg.GradientMethod`,
Four solvers can be used: :class:`sigpy.alg.ConjugateGradient`,
:class:`sigpy.alg.GradientMethod`, :class:`sigpy.alg.ADMM`,
and :class:`sigpy.alg.PrimalDualHybridGradient`.
If ``solver`` is None, :class:`sigpy.alg.ConjugateGradient` is used
when ``proxg`` is not specified. If ``proxg`` is specified,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_alg.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def test_AugmentedLagrangianMethod(self):
x_z = np.zeros([2 * n])
v = np.zeros([n])

def minL(mu):
def minL():
x = x_z[:n]
z = x_z[n:]
x[:] = np.linalg.solve(
Expand Down

0 comments on commit a97daf7

Please sign in to comment.