Merge pull request #242 from SciML/dmw/optim_2

ChrisRackauckas · web-flow · commit 0e1961b3e261 · 2026-01-11T12:59:19.000-01:00
Add support for Optim@2
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "DiffEqNoiseProcess"
 uuid = "77a26b50-5914-5dd7-bc55-306e6241c503"
-version = "5.24.1"
+version = "5.25.0"
 authors = ["Chris Rackauckas <accounts@chrisrackauckas.com>"]
 
 [deps]
@@ -33,7 +33,7 @@ CommonSolve = "0.2.6"
 DiffEqBase = "6.61"
 Distributions = "0.22, 0.23, 0.24, 0.25"
 GPUArraysCore = "0.1, 0.2"
-Optim = "1"
+Optim = "1, 2"
 PoissonRandom = "0.4"
 QuadGK = "2"
 Random123 = "1.2"
diff --git a/src/noise_interfaces/box_wedge_tail_interface.jl b/src/noise_interfaces/box_wedge_tail_interface.jl
@@ -429,10 +429,10 @@ function constrained_optimization_problem(densf, fij, fij2, fij3, fij4, ri, ai,
         [ri + Δr / 2, ai + Δa / 2], Optim.Fminbox(Optim.NelderMead())
     )
     ϵijmin = Optim.optimize(
-        x -> difference(x), [ri, ai], [ri + Δr, ai + Δa],
+        difference, [ri, ai], [ri + Δr, ai + Δa],
         [ri + Δr / 2, ai + Δa / 2], Optim.Fminbox(Optim.NelderMead())
     )
-    return ϵijmin.minimum, ϵijmax.minimum
+    return Optim.minimum(ϵijmin), Optim.minimum(ϵijmax)
 end
 
 function generate_wedges(densf, Δr, Δa, Δz, rM, aM, offset, sqeezing)

Original file line number	Diff line number	Diff line change
`@@ -429,10 +429,10 @@ function constrained_optimization_problem(densf, fij, fij2, fij3, fij4, ri, ai,`
`429`	`429`	`[ri + Δr / 2, ai + Δa / 2], Optim.Fminbox(Optim.NelderMead())`
`430`	`430`	`)`
`431`	`431`	`ϵijmin = Optim.optimize(`
`432`		`- x -> difference(x), [ri, ai], [ri + Δr, ai + Δa],`
	`432`	`+ difference, [ri, ai], [ri + Δr, ai + Δa],`
`433`	`433`	`[ri + Δr / 2, ai + Δa / 2], Optim.Fminbox(Optim.NelderMead())`
`434`	`434`	`)`
`435`		`- return ϵijmin.minimum, ϵijmax.minimum`
	`435`	`+ return Optim.minimum(ϵijmin), Optim.minimum(ϵijmax)`
`436`	`436`	`end`
`437`	`437`
`438`	`438`	`function generate_wedges(densf, Δr, Δa, Δz, rM, aM, offset, sqeezing)`