Skip to content

Commit 1c169e0

Browse files
solve mk function in R2N
1 parent cf29b06 commit 1c169e0

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

src/R2N.jl

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -340,11 +340,14 @@ function SolverCore.solve!(
340340
d -> φ1(d) + ψ(d)::T
341341
end
342342

343-
mk = let ψ = ψ, solver = solver
344-
temp_σ = solver.subpb.model.data.σ
345-
solver.subpb.model.data.σ = zero(T)
346-
d -> obj(solver.subpb.model, d) + ψ(d)::T
347-
solver.subpb.model.data.σ = temp_σ
343+
mk = let ψ = ψ, solver = solver
344+
d -> begin
345+
temp_σ = solver.subpb.model.data.σ
346+
solver.subpb.model.data.σ = zero(T)
347+
smooth_obj = obj(solver.subpb.model, d)
348+
solver.subpb.model.data.σ = temp_σ
349+
return smooth_obj + ψ(d)
350+
end
348351
end
349352

350353
prox!(s1, ψ, mν∇fk, ν₁)

0 commit comments

Comments
 (0)