Skip to content

Commit e4ba09f

Browse files
authored
Merge pull request #378 from SciML/qqy/optimization_solve
2 parents a359485 + 917ca50 commit e4ba09f

File tree

5 files changed

+7
-3
lines changed

5 files changed

+7
-3
lines changed

lib/BoundaryValueDiffEqCore/Project.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ LineSearch = "87fe0de2-c867-4266-b59a-2f0a94fc965b"
1414
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1515
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
1616
NonlinearSolveFirstOrder = "5959db7a-ea39-4486-b5fe-2dd0bf03d60d"
17+
OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb"
1718
PreallocationTools = "d236fae5-4411-538c-8e31-a6e3d9e00b46"
1819
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
1920
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
@@ -37,6 +38,7 @@ LineSearch = "0.1.4"
3738
LinearAlgebra = "1.10"
3839
Logging = "1.10"
3940
NonlinearSolveFirstOrder = "1.2"
41+
OptimizationBase = "3.2.0"
4042
PreallocationTools = "0.4.24"
4143
RecursiveArrayTools = "3.27.0"
4244
Reexport = "1.2"

lib/BoundaryValueDiffEqCore/src/BoundaryValueDiffEqCore.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ using Logging: Logging
1111
using LinearAlgebra
1212
using LineSearch: BackTracking
1313
using NonlinearSolveFirstOrder: NonlinearSolvePolyAlgorithm
14+
using OptimizationBase: OptimizationBase
1415
using PreallocationTools: PreallocationTools, DiffCache
1516
using RecursiveArrayTools: AbstractVectorOfArray, VectorOfArray, DiffEqArray
1617
using Reexport: @reexport

lib/BoundaryValueDiffEqCore/src/default_internal_solve.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,5 @@ end
7979
@inline __internal_solve(
8080
prob::Union{SciMLBase.NonlinearProblem, SciMLBase.NonlinearLeastSquaresProblem},
8181
alg; kwargs...) = __solve(prob, alg; kwargs...)
82-
@inline __internal_solve(prob::SciMLBase.OptimizationProblem, alg; kwargs...) = solve(prob, alg; kwargs...)
82+
@inline __internal_solve(prob::SciMLBase.OptimizationProblem, alg;
83+
kwargs...) = OptimizationBase.solve(prob, alg; kwargs...)

lib/BoundaryValueDiffEqMIRK/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ InteractiveUtils = "<0.0.1, 1"
4545
JET = "0.9.18"
4646
LinearAlgebra = "1.10"
4747
LinearSolve = "2.36.2, 3"
48-
Mooncake = "0.4.146"
48+
Mooncake = "0.4"
4949
OptimizationIpopt = "0.2.0"
5050
OrdinaryDiffEqRosenbrock = "1"
5151
PreallocationTools = "0.4.24"

lib/BoundaryValueDiffEqMIRK/test/mirk_basic_tests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,6 @@ end
494494
residual[2] = u(pi / 2)[1] - pi / 2
495495
end
496496
prob = BVProblem(simplependulum!, bc!, [pi / 2, pi / 2], tspan,
497-
lcons = [0.0, 0.0], ucons = [Inf, Inf])
497+
lcons = [-10.0, -10.0], ucons = [10.0, 10.0])
498498
@test_nowarn sol = solve(prob, MIRK4(; optimize = IpoptOptimizer()), dt = 0.05)
499499
end

0 commit comments

Comments
 (0)