add NLS solvers

Author: tmigot

src/ARCTR.jl

@@ -27,11 +27,12 @@ end
 
 include("main.jl")
 
-export ALL_solvers
+include("solvers.jl")
 
-ALL_solvers = Symbol[]
+export ALL_solvers, NLS_solvers
 
-include("solvers.jl")
+ALL_solvers = keys(solvers_const)
+NLS_solvers = keys(solvers_nls_const)
 
 export TRARC
 
@@ -89,10 +90,9 @@ function TRARC(nlp::AbstractNLPModel{T,S}; kwargs...) where {T,S}
     return stopping_to_stats(nlpstop)
 end
 
-for fun in keys(solvers_const)
-    push!(ALL_solvers, fun)
+for fun in union(keys(solvers_const), keys(solvers_nls_const))
 
-    ht, pt, sm, ka = ARCTR.solvers_const[fun]
+    ht, pt, sm, ka = merge(solvers_const, solvers_nls_const)[fun]
     @eval begin
         function $fun(nlpstop::NLPStopping; kwargs...)
             kw_list = Dict{Symbol,Any}()

src/solvers.jl

@@ -30,3 +30,13 @@ const solvers_const = Dict(
     :TRKOp => (HessOp, PDataTRK, solve_modelTRK, ()),
     :TRKsparse => (HessSparse, PDataTRK, solve_modelTRK, ()),
 )
+
+const solvers_nls_const = Dict(
+    :ARCqKOpGN => (
+        HessGaussNewtonOp,
+        PDataKARC,
+        solve_modelKARC,
+        [:shifts => 10.0 .^ (collect(-10.0:0.5:20.0))],
+    ),
+    :ST_TROpGN => (HessGaussNewtonOp, PDataST, solve_modelST_TR, ()),
+)

test/runtests.jl

@@ -8,15 +8,15 @@ using ADNLPModels, NLPModels, OptimizationProblems.ADNLPProblems, SolverTest
 using Stopping
 
 @testset "Testing NLP solvers" begin
-    @testset "$name" for name in keys(ARCTR.solvers_const)
+    @testset "$name" for name in ALL_solvers
         solver = eval(name)
         unconstrained_nlp(solver)
         multiprecision_nlp(solver, :unc)
     end
 end
 
 @testset "Testing NLS solvers" begin
-    @testset "$name" for name in keys(ARCTR.solvers_const)
+    @testset "$name" for name in union(ALL_solvers, NLS_solvers)
         solver = eval(name)
         unconstrained_nls(solver)
         multiprecision_nls(solver, :unc)