Skip to content

Commit 6d7f406

Browse files
committed
Fix hard coding of admm max iterations
Signed-off-by: Patrick Avery <patrick.avery@kitware.com>
1 parent d076728 commit 6d7f406

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

tomviz/python/DeconvolutionDenoise.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import scipy
55

66

7-
def deconv_admm(g, psf, mu, is_canceled=None):
7+
def deconv_admm(g, psf, mu, is_canceled=None, max_iter=50):
88
# Fast ADMM_TV/L2 algorithm based on "An Augmented Lagrangian Method for Total Variation Video Restoration",
99
# Stanley H. Chan, Student Member, IEEE, Ramsin Khoshabeh, Student Member, IEEE, Kristofor B. Gibson, Student Member, IEEE, Philip E. Gill, and Truong Q. Nguyen, Fellow, IEEE
1010
# IEEE TRANSACTIONS ON IMAGE PROCESSING, VOL. 20, NO. 11, NOVEMBER 2011
@@ -32,7 +32,6 @@ def deconv_admm(g, psf, mu, is_canceled=None):
3232
cov = 1
3333
tol = 1e-4
3434
itr = 0
35-
max_iter = 50
3635
HtG = np.conj(H) * G
3736
vx, vy = der_im(f)
3837
rnorm = np.sum(np.sqrt(vx.ravel() ** 2 + vy.ravel() ** 2))
@@ -656,7 +655,9 @@ def deconv(
656655
if deconv_med == "ADMM_TV":
657656
if scale[0] * scale[1] != 1:
658657
print("ADMM_TV does not support upscaling; forcing scale = [1,1].")
659-
out, original, loss, rdiff = deconv_admm(im, psf, mu, is_canceled=is_canceled)
658+
out, original, loss, rdiff = deconv_admm(
659+
im, psf, mu, is_canceled=is_canceled, max_iter=max_iter
660+
)
660661
elif deconv_med == "APG_TV":
661662
out, original, loss, rdiff = deconv_apg_tv(
662663
im, psf, scale, mu, conv_med=conv_med, max_iter=max_iter,

0 commit comments

Comments
 (0)