Merge pull request #249 from SciML/Vaibhavdixit02-patch-1

Check against `NelderMead` type not object for callback branching

Author: ChrisRackauckas

Project.toml

@@ -1,7 +1,7 @@
 name = "GalacticOptim"
 uuid = "a75be94c-b780-496d-a8a9-0878b188d577"
 authors = ["Vaibhavdixit02 <vaibhavyashdixit@gmail.com>"]
-version = "3.3.0"
+version = "3.3.1"
 
 [deps]
 ArrayInterfaceCore = "30b0a656-2188-435a-8636-2ec0e6a096e2"

lib/GalacticOptimJL/Project.toml

@@ -1,7 +1,7 @@
 name = "GalacticOptimJL"
 uuid = "9d3c5eb1-403b-401b-8c0f-c11105342e6b"
 authors = ["Vaibhav Dixit <vaibhavyashdixit@gmail.com> and contributors"]
-version = "0.1.0"
+version = "0.1.1"
 
 [deps]
 GalacticOptim = "a75be94c-b780-496d-a8a9-0878b188d577"

lib/GalacticOptimJL/src/GalacticOptimJL.jl

@@ -75,7 +75,7 @@ function ___solve(prob::OptimizationProblem, opt::Optim.AbstractOptimizer,
     cur, state = iterate(data)
 
     function _cb(trace)
-        cb_call = opt == Optim.NelderMead() ? callback(decompose_trace(trace).metadata["centroid"], x...) : callback(decompose_trace(trace).metadata["x"], x...)
+        cb_call = opt isa Optim.NelderMead ? callback(decompose_trace(trace).metadata["centroid"], x...) : callback(decompose_trace(trace).metadata["x"], x...)
         if !(typeof(cb_call) <: Bool)
             error("The callback should return a boolean `halt` for whether to stop the optimization process.")
         end

lib/GalacticOptimJL/test/runtests.jl

@@ -18,7 +18,7 @@ using Test
     @test 10 * sol.minimum < l1
 
     prob = OptimizationProblem(rosenbrock, x0, _p)
-    sol = solve(prob, Optim.NelderMead())
+    sol = solve(prob, Optim.NelderMead(;initial_simplex=Optim.AffineSimplexer(;a = 0.025, b = 0.5)))
     @test 10 * sol.minimum < l1
 
     cons = (x, p) -> [x[1]^2 + x[2]^2]