Skip to content

Commit 5900cb7

Browse files
authored
Merge pull request #431 from control-toolbox/251-release-100
1.0.0
2 parents 0ae241c + 1e4f016 commit 5900cb7

80 files changed

Lines changed: 913 additions & 1721 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Project.toml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
name = "OptimalControl"
22
uuid = "5f98b655-cc9a-415a-b60e-744165666948"
33
authors = ["Olivier Cots <olivier.cots@toulouse-inp.fr>"]
4-
version = "0.13.0"
4+
version = "1.0.0"
55

66
[deps]
77
CTBase = "54762871-cc72-4466-b8e8-f6c8b58076cd"
88
CTDirect = "790bbbee-bee9-49ee-8912-a9de031322d5"
99
CTFlows = "1c39547c-7794-42f7-af83-d98194f657c2"
10+
CTModels = "34c4fa32-2049-4079-8329-de33c2a22e2d"
11+
CTParser = "32681960-a1b1-40db-9bff-a1ca817385d1"
1012
CommonSolve = "38540f10-b2f7-11e9-35d8-d573e4eb0ff2"
1113
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
1214

1315
[compat]
14-
CTBase = "0.14"
15-
CTDirect = "0.13"
16-
CTFlows = "0.7"
16+
CTBase = "0.15"
17+
CTDirect = "0.14"
18+
CTFlows = "0.8"
19+
CTModels = "0.2"
20+
CTParser = "0.2"
1721
CommonSolve = "0.2"
1822
DocStringExtensions = "0.9"
1923
julia = "1.10"

docs/Project.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
33
CTBase = "54762871-cc72-4466-b8e8-f6c8b58076cd"
44
CTDirect = "790bbbee-bee9-49ee-8912-a9de031322d5"
55
CTFlows = "1c39547c-7794-42f7-af83-d98194f657c2"
6+
CTModels = "34c4fa32-2049-4079-8329-de33c2a22e2d"
7+
CTParser = "32681960-a1b1-40db-9bff-a1ca817385d1"
68
CommonSolve = "38540f10-b2f7-11e9-35d8-d573e4eb0ff2"
79
DifferentiationInterface = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63"
810
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
@@ -22,17 +24,16 @@ Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb"
2224

2325
[compat]
2426
BenchmarkTools = "1.6"
25-
CTBase = "0.14"
26-
CTDirect = "0.13"
27-
CTFlows = "0.7"
27+
CTBase = "0.15"
28+
CTDirect = "0.14"
29+
CTFlows = "0.8"
2830
CommonSolve = "0.2"
2931
DifferentiationInterface = "0.6"
3032
Documenter = "1.8"
3133
DocumenterMermaid = "0.2"
3234
ForwardDiff = "0.10"
3335
JLD2 = "0.5"
3436
JSON3 = "1.14"
35-
LinearAlgebra = "1.11"
3637
MINPACK = "1.3"
3738
MadNLP = "0.8"
3839
NLPModelsIpopt = "0.10"

docs/make.jl

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ using Documenter
22
using DocumenterMermaid
33
using OptimalControl
44
using CTBase
5-
using CTFlows
65
using CTDirect
6+
using CTFlows
7+
using CTModels
8+
using CTParser
79

810
# to add docstrings from external packages
9-
Modules = [CTBase, CTFlows, CTDirect, OptimalControl]
11+
Modules = [CTBase, CTFlows, CTDirect, CTModels, CTParser, OptimalControl]
1012
for Module in Modules
1113
isnothing(DocMeta.getdocmeta(Module, :DocTestSetup)) &&
1214
DocMeta.setdocmeta!(Module, :DocTestSetup, :(using $Module); recursive=true)
@@ -20,7 +22,7 @@ makedocs(;
2022
format=Documenter.HTML(;
2123
repolink="https://" * repo_url,
2224
prettyurls=false,
23-
size_threshold_ignore=["api-ctbase/types.md", "tutorial-plot.md"],
25+
size_threshold_ignore=["api-ctbase/types.md","dev-ctmodels.md", "tutorial-plot.md"],
2426
assets=[
2527
asset("https://control-toolbox.org/assets/css/documentation.css"),
2628
asset("https://control-toolbox.org/assets/js/documentation.js"),
@@ -38,26 +40,24 @@ makedocs(;
3840
"Solve" => "tutorial-solve.md",
3941
"Plot a solution" => "tutorial-plot.md",
4042
"Flow" => "tutorial-flow.md",
41-
"Control-toolbox REPL" => "tutorial-repl.md",
4243
],
4344
"Tutorials" => [
44-
"tutorial-continuation.md",
45-
"tutorial-nlp.md",
45+
"Discretisation options" => "tutorial-discretisation.md",
46+
"Discrete continuation" => "tutorial-continuation.md",
47+
"NLP options" => "tutorial-nlp.md",
4648
"Goddard: direct, indirect" => "tutorial-goddard.md",
47-
"tutorial-iss.md",
49+
"Indirect simple shooting" => "tutorial-iss.md",
4850
"Linear–quadratic regulator" => "tutorial-lqr-basic.md",
49-
"Minimal action" => "oc_mam.md",
50-
],
51-
"API" => [
52-
"api-optimalcontrol.md",
53-
"Subpackages" => ["api-ctbase.md", "api-ctdirect.md", "api-ctflows.md"],
51+
"Minimal action" => "tutorial-mam.md",
5452
],
5553
"Developers" => [
5654
"OptimalControl.jl" => "dev-optimalcontrol.md",
5755
"Subpackages" => [
5856
"CTBase.jl" => "dev-ctbase.md",
5957
"CTDirect.jl" => "dev-ctdirect.md",
6058
"CTFlows.jl" => "dev-ctflows.md",
59+
"CTModels.jl" => "dev-ctmodels.md",
60+
"CTParser.jl" => "dev-ctparser.md",
6161
],
6262
],
6363
"Zhejiang 2025" => "zhejiang-2025.md",

docs/src/api-ctbase.md

Lines changed: 0 additions & 42 deletions
This file was deleted.

docs/src/api-ctbase/description.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

docs/src/api-ctbase/diffgeometry.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

docs/src/api-ctbase/exceptions.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

docs/src/api-ctbase/init.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

docs/src/api-ctbase/model.md

Lines changed: 0 additions & 36 deletions
This file was deleted.

docs/src/api-ctbase/parser.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)