From d6b041f81e9f7e66c1c1e3ef417bc34d66a99c9b Mon Sep 17 00:00:00 2001 From: Stephan Hilb <stephan@ecshi.net> Date: Thu, 15 Jul 2021 12:15:20 +0200 Subject: [PATCH] fix: use global coordinate for evaluation of expressions --- src/run.jl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/run.jl b/src/run.jl index 7fef3a5..e51e2d6 100644 --- a/src/run.jl +++ b/src/run.jl @@ -77,7 +77,7 @@ function step!(ctx::L1L2TVContext) gamma1 = ctx.gamma1 gamma2 = ctx.gamma2 - function du_a(x, du, nabladu, phi, nablaphi; g, u, nablau, p1, p2, tdata) + function du_a(x_, du, nabladu, phi, nablaphi; g, u, nablau, p1, p2, tdata) m1 = max(gamma1, norm(T(tdata, u) - g)) cond1 = norm(T(tdata, u) - g) > gamma1 ? dot(T(tdata, u) - g, T(tdata, du)) / norm(T(tdata, u) - g)^2 * p1 : @@ -98,7 +98,7 @@ function step!(ctx::L1L2TVContext) return a1 + a2 + aB end - function du_l(x, phi, nablaphi; g, u, nablau, p1, p2, tdata) + function du_l(x_, phi, nablaphi; g, u, nablau, p1, p2, tdata) aB = alpha2 * dot(T(tdata, u), T(tdata, phi)) + beta * dot(S(u, nablau), S(phi, nablaphi)) m1 = max(gamma1, norm(T(tdata, u) - g)) @@ -119,7 +119,7 @@ function step!(ctx::L1L2TVContext) # solve dp1 - function dp1_update(x; g, u, p1, du, tdata) + function dp1_update(x_; g, u, p1, du, tdata) m1 = max(gamma1, norm(T(tdata, u) - g)) cond = norm(T(tdata, u) - g) > gamma1 ? dot(T(tdata, u) - g, T(tdata, du)) / norm(T(tdata, u) - g)^2 * p1 : @@ -130,7 +130,7 @@ function step!(ctx::L1L2TVContext) ctx.g, ctx.u, ctx.p1, ctx.du, ctx.tdata) # solve dp2 - function dp2_update(x; u, nablau, p2, du, nabladu) + function dp2_update(x_; u, nablau, p2, du, nabladu) m2 = max(gamma2, norm(nablau)) cond = norm(nablau) > gamma2 ? dot(nablau, nabladu) / norm(nablau)^2 * p2 : @@ -182,7 +182,7 @@ end function estimate!(ctx::L1L2TVContext) huber(x, gamma) = abs(x) < gamma ? x^2 / (2 * gamma) : abs(x) - gamma / 2 - function estf(x; g, u, p1, p2, nablau, w, nablaw, tdata) + function estf(x_; g, u, p1, p2, nablau, w, nablaw, tdata) alpha1part = iszero(ctx.alpha1) ? 0. : ctx.alpha1 * ( huber(norm(ctx.T(tdata, u) - g), ctx.gamma1) + dot(ctx.T(tdata, u) - g, p1 / ctx.alpha1) + -- GitLab