diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..ba39cc53 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +Manifest.toml diff --git a/src/LM_alg.jl b/src/LM_alg.jl index aefbce48..c4f07cbe 100644 --- a/src/LM_alg.jl +++ b/src/LM_alg.jl @@ -66,7 +66,7 @@ function LMSolver( shifted(reg_nls.h, xk) Jk = jac_op_residual(reg_nls.model, xk) - sub_nlp = LMModel(Jk, Fk, T(1), xk) + sub_nlp = LMModel(Jk, Fk, T(0), xk) subpb = RegularizedNLPModel(sub_nlp, ψ) substats = RegularizedExecutionStats(subpb) subsolver = subsolver(subpb) @@ -300,7 +300,7 @@ function SolverCore.solve!( end mk = let ψ = ψ, solver = solver - d -> obj(solver.subpb.model, d) + ψ(d) + d -> obj(solver.subpb.model, d) - solver.subpb.model.σ * dot(d, d) / 2 + ψ(d) end prox!(s, ψ, mν∇fk, ν) diff --git a/src/R2N.jl b/src/R2N.jl index 26a8eea0..058d012c 100644 --- a/src/R2N.jl +++ b/src/R2N.jl @@ -68,7 +68,7 @@ function R2NSolver( shifted(reg_nlp.h, xk) Bk = hess_op(reg_nlp.model, x0) - sub_nlp = R2NModel(Bk, ∇fk, T(1), x0) + sub_nlp = R2NModel(Bk, ∇fk, T(0), x0) subpb = RegularizedNLPModel(sub_nlp, ψ) substats = RegularizedExecutionStats(subpb) subsolver = subsolver(subpb) @@ -327,7 +327,7 @@ function SolverCore.solve!( end mk = let ψ = ψ, solver = solver - d -> obj(solver.subpb.model, d) + ψ(d)::T + d -> obj(solver.subpb.model, d) - solver.subpb.model.σ * dot(d, d) / 2 + ψ(d)::T end prox!(s1, ψ, mν∇fk, ν₁)