Skip to content

Commit cf29b06

Browse files
remove skip_sigma
1 parent a736a90 commit cf29b06

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

src/R2N.jl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,10 @@ function SolverCore.solve!(
341341
end
342342

343343
mk = let ψ = ψ, solver = solver
344-
d -> obj(solver.subpb.model, d, skip_sigma = true) + ψ(d)::T
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_σ
345348
end
346349

347350
prox!(s1, ψ, mν∇fk, ν₁)
@@ -375,7 +378,7 @@ function SolverCore.solve!(
375378
while !done
376379
sub_atol = stats.iter == 0 ? 1.0e-3 : min(sqrt_ξ1_νInv ^ (1.5), sqrt_ξ1_νInv * 1e-3)
377380

378-
solver.subpb.model.σ = σk
381+
solver.subpb.model.data.σ = σk
379382
isa(solver.subsolver, R2DHSolver) && (solver.subsolver.D.d[1] = 1/ν₁)
380383
if isa(solver.subsolver, R2Solver) #FIXME
381384
solve!(

0 commit comments

Comments
 (0)