Skip to content
Snippets Groups Projects
Commit 1f220c07 authored by Stephan Hilb's avatar Stephan Hilb
Browse files

fix cosmetics

parent 36cfd8ad
No related branches found
No related tags found
No related merge requests found
...@@ -112,7 +112,8 @@ function step!(ctx::L1L2TVContext) ...@@ -112,7 +112,8 @@ function step!(ctx::L1L2TVContext)
# solve du # solve du
print("assemble ... ") print("assemble ... ")
A, b = assemble(ctx.du.space, du_a, du_l; ctx.g, ctx.u, ctx.nablau, ctx.p1, ctx.p2, ctx.tdata) A, b = assemble(ctx.du.space, du_a, du_l;
ctx.g, ctx.u, ctx.nablau, ctx.p1, ctx.p2, ctx.tdata)
print("solve ... ") print("solve ... ")
ctx.du.data .= A \ b ctx.du.data .= A \ b
...@@ -124,7 +125,8 @@ function step!(ctx::L1L2TVContext) ...@@ -124,7 +125,8 @@ function step!(ctx::L1L2TVContext)
zero(p1) zero(p1)
return -p1 + alpha1 / m1 * (T(tdata, u) + T(tdata, du) - g) - cond return -p1 + alpha1 / m1 * (T(tdata, u) + T(tdata, du) - g) - cond
end end
interpolate!(ctx.dp1, dp1_update; ctx.g, ctx.u, ctx.p1, ctx.du, ctx.tdata) interpolate!(ctx.dp1, dp1_update;
ctx.g, ctx.u, ctx.p1, ctx.du, ctx.tdata)
# solve dp2 # solve dp2
function dp2_update(x; u, nablau, p2, du, nabladu) function dp2_update(x; u, nablau, p2, du, nabladu)
...@@ -134,7 +136,8 @@ function step!(ctx::L1L2TVContext) ...@@ -134,7 +136,8 @@ function step!(ctx::L1L2TVContext)
zero(p2) zero(p2)
return -p2 + lambda / m2 * (nablau + nabladu) - cond return -p2 + lambda / m2 * (nablau + nabladu) - cond
end end
interpolate!(ctx.dp2, dp2_update; ctx.u, ctx.nablau, ctx.p2, ctx.du, ctx.nabladu) interpolate!(ctx.dp2, dp2_update;
ctx.u, ctx.nablau, ctx.p2, ctx.du, ctx.nabladu)
# newton update # newton update
ctx.u.data .+= ctx.du.data ctx.u.data .+= ctx.du.data
...@@ -263,7 +266,7 @@ function inpaint(img, imgmask; name, params...) ...@@ -263,7 +266,7 @@ function inpaint(img, imgmask; name, params...)
pvd = paraview_collection("$(ctx.name).pvd") pvd = paraview_collection("$(ctx.name).pvd")
pvd[0] = save_inpaint(0) pvd[0] = save_inpaint(0)
for i in 1:10 for i in 1:20
step!(ctx) step!(ctx)
estimate!(ctx) estimate!(ctx)
pvd[i] = save_inpaint(i) pvd[i] = save_inpaint(i)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment