Skip to content

Commit 772fd02

Browse files
authored
Merge pull request #577 from control-toolbox/576-general-update-compat-ctparser
Up compat CTParser
2 parents 21b12ec + 0bd006f commit 772fd02

16 files changed

Lines changed: 253 additions & 99 deletions

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ CTBase = "0.16"
2020
CTDirect = "0.15"
2121
CTFlows = "0.8"
2222
CTModels = "0.6"
23-
CTParser = "0.4"
23+
CTParser = "0.5"
2424
CommonSolve = "0.2"
2525
DocStringExtensions = "0.9"
2626
ExaModels = "0.8"

docs/Project.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
1010
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
1111
DocumenterInterLinks = "d12716ef-a0f6-4df4-a9f1-a5a34e75c656"
1212
DocumenterMermaid = "a078cd44-4d9c-4618-b545-3ab9d77f9177"
13+
ExaModels = "1037b233-b668-4ce9-9b63-f9f681f55dd2"
1314
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
1415
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
1516
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -26,7 +27,7 @@ CTBase = "0.16"
2627
CTDirect = "0.15"
2728
CTFlows = "0.8"
2829
CTModels = "0.6"
29-
CTParser = "0.4"
30+
CTParser = "0.5"
3031
CommonSolve = "0.2"
3132
DataFrames = "1"
3233
Documenter = "1.8"

docs/make.jl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ using CommonSolve
1111
using OrdinaryDiffEq
1212
using DocumenterInterLinks
1313
using ADNLPModels
14+
using ExaModels
1415
using NLPModelsIpopt
1516
using MadNLP
1617
using JSON3
@@ -54,6 +55,11 @@ links = InterLinks(
5455
"https://jso.dev/NLPModelsIpopt.jl/stable/objects.inv",
5556
joinpath(@__DIR__, "inventories", "NLPModelsIpopt.toml"),
5657
),
58+
"ExaModels" => (
59+
"https://exanauts.github.io/ExaModels.jl/stable/",
60+
"https://exanauts.github.io/ExaModels.jl/stable/objects.inv",
61+
joinpath(@__DIR__, "inventories", "ExaModels.toml"),
62+
),
5763
"MadNLP" => (
5864
"https://madnlp.github.io/MadNLP.jl/stable/",
5965
"https://madnlp.github.io/MadNLP.jl/stable/objects.inv",

docs/src/api-optimalcontrol-user.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Solution
4646
VectorField
4747
available_methods
4848
build_OCP_solution
49-
constraint
49+
constraint(::Model, ::Symbol)
5050
constraints
5151
constraints_violation
5252
control
@@ -79,7 +79,9 @@ iterations
7979
lagrange
8080
mayer
8181
message
82-
objective
82+
model
83+
objective(::Model)
84+
objective(::Solution)
8385
plot(::Solution, ::Symbol...)
8486
plot!(::Plots.Plot, ::Solution, ::Symbol...)
8587
set_initial_guess
@@ -93,7 +95,8 @@ successful
9395
time_grid
9496
time_name
9597
times
96-
variable
98+
variable(::Model)
99+
variable(::Solution)
97100
variable_components
98101
variable_dimension
99102
variable_name

0 commit comments

Comments
 (0)