Skip to content

Commit 1188fa0

Browse files
authored
Merge pull request #37 from control-toolbox/36-general-compat
Update compat
2 parents 8942c9e + b795951 commit 1188fa0

File tree

9 files changed

+219
-131
lines changed

9 files changed

+219
-131
lines changed

docs/Project.toml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
33
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
44
DifferentiationInterface = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63"
55
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
6+
DocumenterInterLinks = "d12716ef-a0f6-4df4-a9f1-a5a34e75c656"
67
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
78
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
89
MINPACK = "4854310b-de5a-5eb6-a2a5-c1dee2bd17f9"
@@ -20,16 +21,17 @@ Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb"
2021
BenchmarkTools = "1.6"
2122
DataFrames = "1.7"
2223
DifferentiationInterface = "0.7"
23-
Documenter = "1.8"
24+
Documenter = "1.14"
25+
DocumenterInterLinks = "1.1"
2426
ForwardDiff = "0.10, 1"
2527
LinearAlgebra = "1"
2628
MINPACK = "1.3"
2729
MadNLP = "0.8"
2830
NLPModels = "0.21"
2931
NLPModelsIpopt = "0.10"
30-
NonlinearSolve = "4.6"
31-
OptimalControl = "1.0"
32-
OrdinaryDiffEq = "6.93"
32+
NonlinearSolve = "4.10"
33+
OptimalControl = "1.1"
34+
OrdinaryDiffEq = "6"
3335
Plots = "1.40"
3436
Printf = "1"
3537
Suppressor = "0.2"

docs/extras/disc.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ for adnlp_backend in backends
9090
println("Testing backend: ", adnlp_backend)
9191

9292
# Discretize the problem with a large grid size and Gauss-Legendre method
93-
bt = @btimed direct_transcription(
93+
docp = @btimed direct_transcription(
9494
$ocp; disc_method=:euler, grid_size=1000, adnlp_backend=($adnlp_backend)
9595
)
96-
docp, nlp = bt.value
96+
nlp = model(docp)
9797
prepa_time = bt.time
9898

9999
# Get the number of non-zero elements

docs/make.jl

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
using Documenter
2+
using DocumenterInterLinks
23
using OptimalControl
34

5+
#
6+
links = InterLinks(
7+
"CTDirect" => (
8+
"https://control-toolbox.org/CTDirect.jl/stable/",
9+
"https://control-toolbox.org/CTDirect.jl/stable/objects.inv",
10+
joinpath(@__DIR__, "inventories", "CTDirect.toml"),
11+
),
12+
"OptimalControl" => (
13+
"https://control-toolbox.org/OptimalControl.jl/stable/",
14+
"https://control-toolbox.org/OptimalControl.jl/stable/objects.inv",
15+
joinpath(@__DIR__, "inventories", "OptimalControl.toml"),
16+
),
17+
)
18+
419
# For reproducibility
520
mkpath(joinpath(@__DIR__, "src", "assets"))
621
cp(
@@ -46,6 +61,7 @@ makedocs(;
4661
"Model Predictive Control" => "tutorial-mpc.md",
4762
],
4863
],
64+
plugins=[links],
4965
)
5066

5167
deploydocs(; repo=repo_url * ".git", devbranch="main")

0 commit comments

Comments
 (0)