Skip to content

Adapt to CTModels v0.7.x and integrate CTSolvers #693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ocots wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Adapt to CTModels v0.7.x and integrate CTSolvers #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a6536ad
chore: add CTBase v0.17 compat
ocots Jan 17, 2026
bc58093
fix doc
ocots Jan 17, 2026
8ddf66b
Merge test dependencies into main Project.toml and fix documentation …
ocots Jan 17, 2026
5eb0624
remove OC
ocots Jan 17, 2026
d22ca98
Widen compat for CTParser v0.8.x migration
ocots Jan 17, 2026
4aed34f
refactor: adapt OptimalControl to CTModels v0.7 and CTSolvers integra…
ocots Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ Manifest.toml

#
docs/tmp/
save/
41 changes: 36 additions & 5 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OptimalControl"
uuid = "5f98b655-cc9a-415a-b60e-744165666948"
version = "1.1.8-beta"
authors = ["Olivier Cots <olivier.cots@toulouse-inp.fr>"]
version = "1.1.6"

[deps]
ADNLPModels = "54578032-b7ea-4c30-94aa-7cbd1cce6c9a"
Expand All @@ -10,20 +10,51 @@ CTDirect = "790bbbee-bee9-49ee-8912-a9de031322d5"
CTFlows = "1c39547c-7794-42f7-af83-d98194f657c2"
CTModels = "34c4fa32-2049-4079-8329-de33c2a22e2d"
CTParser = "32681960-a1b1-40db-9bff-a1ca817385d1"
CTSolvers = "d3e8d392-8e4b-4d9b-8e92-d7d4e3650ef6"
CommonSolve = "38540f10-b2f7-11e9-35d8-d573e4eb0ff2"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
ExaModels = "1037b233-b668-4ce9-9b63-f9f681f55dd2"
NLPModels = "a4795742-8479-5a88-8948-cc11e1c8c1a6"
RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
SolverCore = "ff4d7338-4cf1-434d-91df-b86cb86fb843"

[compat]
ADNLPModels = "0.8"
CTBase = "0.16"
CTDirect = "0.17"
CTBase = "0.17"
CTDirect = "0.18"
CTFlows = "0.8"
CTModels = "0.6"
CTParser = "0.7"
CTModels = "0.7"
CTParser = "0.7, 0.8"
CTSolvers = "0.2"
CommonSolve = "0.2"
DifferentiationInterface = "0.7"
DocStringExtensions = "0.9"
ExaModels = "0.9"
ForwardDiff = "0.10, 1.0"
LinearAlgebra = "1"
MadNLP = "0.8"
MadNLPMumps = "0.5"
NLPModels = "0.21.7"
NLPModelsIpopt = "0.11"
NonlinearSolve = "4"
OrdinaryDiffEq = "6"
RecipesBase = "1"
SolverCore = "0.3.9"
SplitApplyCombine = "1"
Test = "1"
julia = "1.10"

[extras]
DifferentiationInterface = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63"
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
MadNLP = "2621e9c9-9eb4-46b1-8089-e8c72242dfb6"
MadNLPMumps = "3b83494e-c0a4-4895-918b-9157a7a085a1"
NLPModelsIpopt = "f4238b75-b362-5c4c-b852-0801c9a21d71"
NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
SplitApplyCombine = "03a91e81-4c3e-53e1-a0a4-9c0c8f19dd66"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["DifferentiationInterface", "ForwardDiff", "LinearAlgebra", "MadNLP", "MadNLPMumps", "NLPModelsIpopt", "NonlinearSolve", "OrdinaryDiffEq", "SplitApplyCombine", "Test"]
15 changes: 15 additions & 0 deletions diag.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
using Pkg
Pkg.activate(".")

# We want to see if AbstractOptimalControlProblem is defined BEFORE ctmodels.jl:4
# So we can't just use OptimalControl because it errors.

# Let's manually include things up to ctmodels.jl
include("src/imports/ctbase.jl")
include("src/imports/ctparser.jl")
include("src/imports/plots.jl")

println("Defined before ctmodels: ", isdefined(Main, :AbstractOptimalControlProblem))
if isdefined(Main, :AbstractOptimalControlProblem)
println("Parent: ", parentmodule(Main.AbstractOptimalControlProblem))
end
Loading
Loading