adds nlopt retcode handling

Author: ValentinKaisermayer

lib/OptimizationEvolutionary/src/OptimizationEvolutionary.jl

@@ -23,7 +23,7 @@ function __map_optimizer_args(prob::OptimizationProblem,
                               abstol::Union{Number, Nothing} = nothing,
                               reltol::Union{Number, Nothing} = nothing,
                               kwargs...)
-    mapped_args = (;kwargs...)
+    mapped_args = (; kwargs...)
 
     if !isnothing(callback)
         mapped_args = (; mapped_args..., callback = callback)

lib/OptimizationEvolutionary/test/runtests.jl

@@ -28,7 +28,8 @@ Random.seed!(1234)
     @test res[1]≈0.0625 atol=1e-5
     @test sol.objective < l1
 
-    prob = OptimizationProblem(optprob, x0, _p, lcons = [-Inf], ucons = [5.0], lb = [0.0, 1.0], ub = [Inf, Inf])
+    prob = OptimizationProblem(optprob, x0, _p, lcons = [-Inf], ucons = [5.0],
+                               lb = [0.0, 1.0], ub = [Inf, Inf])
     sol = solve(prob, CMAES(μ = 40, λ = 100))
     res = zeros(1)
     cons_circ(res, sol.u, nothing)

lib/OptimizationNLopt/src/OptimizationNLopt.jl

@@ -77,6 +77,33 @@ function __map_optimizer_args!(prob::OptimizationProblem, opt::NLopt.Opt;
     return nothing
 end
 
+function __nlopt_status_to_ReturnCode(status::NLOpt.Result)
+    if status in [
+        NLOpt.SUCCESS,
+        NLOpt.STOPVAL_REACHED,
+        NLOpt.FTOL_REACHED,
+        NLOpt.XTOL_REACHED,
+    ]
+        return ReturnCode.Success
+    elseif status in [
+        NLOpt.MAXEVAL_REACHED,
+    ]
+        return ReturnCode.MaxIters
+    elseif status == NLOpt.MAXTIME_REACHED
+        return ReturnCode.MaxTime
+    elseif status in [
+        NLOpt.OUT_OF_MEMORY,
+        NLOpt.INVALID_ARGS,
+        NLOpt.FAILURE,
+        NLOpt.ROUNDOFF_LIMITED,
+        NLOpt.FORCED_STOP,
+    ]
+        return ReturnCode.Failure
+    else
+        return ReturnCode.Default
+    end
+end
+
 function SciMLBase.__solve(prob::OptimizationProblem,
                            opt::Union{NLopt.Algorithm, NLopt.Opt};
                            maxiters::Union{Number, Nothing} = nothing,
@@ -134,8 +161,9 @@ function SciMLBase.__solve(prob::OptimizationProblem,
     (minf, minx, ret) = NLopt.optimize(opt_setup, prob.u0)
     t1 = time()
 
+    retcode = __nlopt_status_to_ReturnCode(ret)
     SciMLBase.build_solution(SciMLBase.DefaultOptimizationCache(prob.f, prob.p), opt, minx,
-                             minf; original = opt_setup, retcode = ret,
+                             minf; original = opt_setup, retcode = retcode,
                              solve_time = t1 - t0)
 end