Skip to content

Commit b732ced

Browse files
committed
fix tests for OptimizationSciPy
update location for IncompatibleOptimizerError fix bug in error
1 parent e1645a8 commit b732ced

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

lib/OptimizationSciPy/src/OptimizationSciPy.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ function SciMLBase.__init(prob::SciMLBase.OptimizationProblem, opt::ScipyOptimiz
283283
requires_bounds = opt isa Union{
284284
ScipyDifferentialEvolution, ScipyDirect, ScipyDualAnnealing, ScipyBrute}
285285
if requires_bounds && (isnothing(prob.lb) || isnothing(prob.ub))
286-
throw(SciMLBase.IncompatibleOptimizerError("$(typeof(opt)) requires bounds"))
286+
throw(OptimizationBase.IncompatibleOptimizerError("$(typeof(opt)) requires bounds"))
287287
end
288288
if opt isa ScipyMinimizeScalar && length(prob.u0) != 1
289289
throw(ArgumentError("ScipyMinimizeScalar requires exactly 1 variable, got $(length(prob.u0)). Use ScipyMinimize for multivariate problems."))

lib/OptimizationSciPy/test/runtests.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -435,10 +435,10 @@ end
435435
@test sol.u [3.0] atol=1e-6
436436
optprob = OptimizationFunction(rosenbrock, OptimizationBase.AutoZygote())
437437
prob = OptimizationProblem(optprob, x0, _p)
438-
@test_throws SciMLBase.IncompatibleOptimizerError solve(prob, ScipyDifferentialEvolution())
439-
@test_throws SciMLBase.IncompatibleOptimizerError solve(prob, ScipyDirect())
440-
@test_throws SciMLBase.IncompatibleOptimizerError solve(prob, ScipyDualAnnealing())
441-
@test_throws SciMLBase.IncompatibleOptimizerError solve(prob, ScipyBrute())
438+
@test_throws OptimizationBase.IncompatibleOptimizerError solve(prob, ScipyDifferentialEvolution())
439+
@test_throws OptimizationBase.IncompatibleOptimizerError solve(prob, ScipyDirect())
440+
@test_throws OptimizationBase.IncompatibleOptimizerError solve(prob, ScipyDualAnnealing())
441+
@test_throws OptimizationBase.IncompatibleOptimizerError solve(prob, ScipyBrute())
442442
@test_throws ArgumentError solve(prob, ScipyBrent())
443443
@test_throws ArgumentError solve(prob, ScipyRootScalar("brentq"))
444444
end

0 commit comments

Comments
 (0)