Skip to content

Commit fbfdcc9

Browse files
authored
Merge pull request #450 from control-toolbox/251-release-100-jb
tuto update (jb)
2 parents 24f7954 + 8a2831d commit fbfdcc9

4 files changed

Lines changed: 5 additions & 6 deletions

File tree

docs/Project.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ MINPACK = "4854310b-de5a-5eb6-a2a5-c1dee2bd17f9"
1717
MadNLP = "2621e9c9-9eb4-46b1-8089-e8c72242dfb6"
1818
NLPModelsIpopt = "f4238b75-b362-5c4c-b852-0801c9a21d71"
1919
NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
20-
OptimalControl = "5f98b655-cc9a-415a-b60e-744165666948"
2120
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
2221
Percival = "01435c0c-c90d-11e9-3788-63660f8fbccc"
2322
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"

docs/make.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ makedocs(;
4646
"Discrete continuation" => "tutorial-continuation.md",
4747
"NLP options" => "tutorial-nlp.md",
4848
"Goddard: direct, indirect" => "tutorial-goddard.md",
49-
"tutorial-iss.md",
49+
"Indirect simple shooting" => "tutorial-iss.md",
5050
"Linear–quadratic regulator" => "tutorial-lqr-basic.md",
51-
"Minimal action" => "tutorial_mam.md",
51+
"Minimal action" => "tutorial-mam.md",
5252
],
5353
"Developers" => [
5454
"OptimalControl.jl" => "dev-optimalcontrol.md",

docs/src/juliacon2024.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ subject to
2424
\dot{x}(t) = f(x(t), u(t)),\quad t \in [t_0, t_f]
2525
```
2626

27-
plus boundary, control and state constraints
27+
plus boundary conditions, control and state constraints
2828

2929
- Our core interests: numerical & geometrical methods in control, applications
3030

@@ -68,4 +68,4 @@ Jean-Baptiste Caillau is partially funded by a **France 2030** support managed b
6868

6969
```@raw html
7070
<img width="200" alt="affiliations" src="./assets/france-2030.png">
71-
```
71+
```
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ println(" Time Objective Iterations")
112112
for T=Ts
113113
global sol = solve(ocp(T); display=false, init=sol, grid_size=1000, tol=1e-8)
114114
@printf("%6.2f %9.6e %d\n", T, objective(sol), iterations(sol))
115-
push!(objectives, sol.objective)
115+
push!(objectives, objective(sol))
116116
end
117117
```
118118

0 commit comments

Comments
 (0)