Skip to content

Commit 9aedf67

Browse files
authored
Merge pull request #17 from control-toolbox/16-dev-up-compat-release-10-optimalcontrol
OptimalControl 1.0
2 parents e69bc27 + 459cb07 commit 9aedf67

File tree

5 files changed

+77
-22
lines changed

5 files changed

+77
-22
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "CalculusOfVariations"
22
uuid = "33922b39-d0c9-4121-8f1f-33c1dad529cf"
33
authors = ["Olivier Cots <olivier.cots@irit.fr>"]
4-
version = "0.1.3"
4+
version = "0.2.0"
55

66
[compat]
77
julia = "1.10"

docs/Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb"
1010
[compat]
1111
Documenter = "1.6"
1212
ForwardDiff = "0.10"
13-
OptimalControl = "0.12"
14-
OrdinaryDiffEq = "6.88"
13+
OptimalControl = "1.0"
14+
OrdinaryDiffEq = "6.93"
1515
Plots = "1.40"
1616
Roots = "2.1"
1717
Suppressor = "0.2"

docs/make.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ makedocs(;
99
format=Documenter.HTML(;
1010
repolink="https://" * repo_url,
1111
prettyurls=false,
12-
size_threshold_ignore=["index.md"],
12+
size_threshold_ignore=["index.md", "application-surface-revolution.md"],
1313
assets=[
1414
asset("https://control-toolbox.org/assets/css/documentation.css"),
1515
asset("https://control-toolbox.org/assets/js/documentation.js"),
1616
],
1717
),
1818
pages=[
1919
"Introduction" => "index.md",
20-
"Catenoid solution" => "application-surface-revolution.md",
20+
"Surface of revolution" => "application-surface-revolution.md",
2121
],
2222
)
2323

docs/src/application-surface-revolution.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -245,13 +245,13 @@ for p0 ∈ p0s # plot for each p₀ in p0s
245245
flow_p0 = ocp_flow((t0, tf_), x0, p0; saveat=tspan, callback=cbt)
246246
247247
T = tspan
248-
X = flow_p0.state.(T)
249-
P = flow_p0.costate.(T)
248+
X = state(flow_p0).(T)
249+
P = costate(flow_p0).(T)
250250
251-
plot!(plt_x, T, X; color=:blue)
252-
plot!(plt_p, T, P; color=:blue)
253-
plot!(plt_u, T, u.(X, P); color=:blue)
254-
plot!(plt_phase, X, P; color=:blue)
251+
plot!(plt_x, T, X; color=:blue)
252+
plot!(plt_p, T, P; color=:blue)
253+
plot!(plt_u, T, u.(X, P); color=:blue)
254+
plot!(plt_phase, X, P; color=:blue)
255255
256256
end
257257
@@ -318,13 +318,13 @@ for (p0, label) ∈ zip(p0s, labels) # plot for each p₀ in p0s
318318
flow_p0 = ocp_flow((t0, tf), x0, p0; saveat=tspan)
319319
320320
T = tspan
321-
X = flow_p0.state.(T)
322-
P = flow_p0.costate.(T)
321+
X = state(flow_p0).(T)
322+
P = costate(flow_p0).(T)
323323
324-
plot!(plt2_x, T, X; label=label)
325-
plot!(plt2_p, T, P; label=label)
326-
plot!(plt2_u, T, u.(X, P); label=label)
327-
plot!(plt2_phase, X, P; label=label)
324+
plot!(plt2_x, T, X; label=label)
325+
plot!(plt2_p, T, P; label=label)
326+
plot!(plt2_u, T, u.(X, P); label=label)
327+
plot!(plt2_phase, X, P; label=label)
328328
329329
end
330330

docs/src/index.md

Lines changed: 60 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Calculus of variations
22

3-
## Introduction
3+
## Mathematical formulation
44

55
Let consider $\mathcal{I}$ an open interval of $\mathbb{R}$, $\Omega$ an open set of $\mathbb{R}^n$ and
66
a continuous application
@@ -59,11 +59,66 @@ generally on the state $x$ and the control $u$.
5959

6060
You may find an example of such a problem [here](@ref catenoid).
6161

62-
## Dependencies
62+
## Reproducibility
6363

64-
All the numerical simulations to generate this documentation are performed with the following packages.
64+
```@raw html
65+
<details><summary>The documentation of this package was built using these direct dependencies,</summary>
66+
```
67+
68+
```@example
69+
using Pkg # hide
70+
Pkg.status() # hide
71+
```
72+
73+
```@raw html
74+
</details>
75+
```
76+
77+
```@raw html
78+
<details><summary>and using this machine and Julia version.</summary>
79+
```
6580

6681
```@example
67-
using Pkg
68-
Pkg.status()
82+
using InteractiveUtils # hide
83+
versioninfo() # hide
84+
```
85+
86+
```@raw html
87+
</details>
88+
```
89+
90+
```@raw html
91+
<details><summary>A more complete overview of all dependencies and their versions is also provided.</summary>
92+
```
93+
94+
```@example
95+
using Pkg # hide
96+
Pkg.status(; mode = PKGMODE_MANIFEST) # hide
97+
```
98+
99+
```@raw html
100+
</details>
101+
```
102+
103+
```@eval
104+
using TOML
105+
using Markdown
106+
version = TOML.parse(read("../../Project.toml", String))["version"]
107+
name = TOML.parse(read("../../Project.toml", String))["name"]
108+
link_manifest = "https://github.com/SciML/" *
109+
name *
110+
".jl/tree/gh-pages/v" *
111+
version *
112+
"/assets/Manifest.toml"
113+
link_project = "https://github.com/SciML/" *
114+
name *
115+
".jl/tree/gh-pages/v" *
116+
version *
117+
"/assets/Project.toml"
118+
Markdown.parse("""You can also download the
119+
[manifest]($link_manifest)
120+
file and the
121+
[project]($link_project)
122+
file.
123+
""")
69124
```

0 commit comments

Comments
 (0)