Skip to content

Commit

Permalink
Merge pull request #74 from sidward/main
Browse files Browse the repository at this point in the history
Add tol option to other algs in LinearLeastSquares
  • Loading branch information
frankong committed Apr 22, 2021
2 parents 4a5e0f6 + a637ce0 commit f076879
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions sigpy/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,8 @@ def _get_ConjugateGradient(self):
util.axpy(AHy, self.lamda, self.z)

self.alg = ConjugateGradient(
AHA, AHy, self.x, P=self.P, max_iter=self.max_iter)
AHA, AHy, self.x, P=self.P, max_iter=self.max_iter,
tol=self.tol)

def _get_GradientMethod(self):
def gradf(x):
Expand Down Expand Up @@ -379,7 +380,8 @@ def _get_PrimalDualHybridGradient(self):
self.sigma,
gamma_primal=gamma_primal,
gamma_dual=gamma_dual,
max_iter=self.max_iter)
max_iter=self.max_iter,
tol=self.tol)

def _get_ADMM(self):
r"""Considers the formulation:
Expand Down

0 comments on commit f076879

Please sign in to comment.