Skip to content

Commit

Permalink
Merge pull request #158 from control-toolbox/doc
Browse files Browse the repository at this point in the history
Doc
  • Loading branch information
ocots authored Oct 5, 2023
2 parents 825c580 + 506c028 commit 53b2ac6
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ Manifest.toml
*/.ipynb_checkpoints

#
docs/src/tmp/
docs/tmp/
1 change: 1 addition & 0 deletions docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ makedocs(
],
"API" => "api.md",
"JuliaCon2023" => "juliacon2023.md",
"JuliaOpt2023" => "juliaopt2023.md",
]
)

Expand Down
Binary file added docs/src/assets/juliaopt2023.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions docs/src/juliaopt2023.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
```@raw html
<img width="800" alt="juliacon" src="./assets/juliacon.jpg">
<img width="800" alt="juliaopt2023" src="./assets/juliaopt2023.jpg">
```

# Solving optimal control problems with Julia
Expand Down Expand Up @@ -27,8 +27,9 @@ plus boundary, control and state constraints
- [Coupling direct and indirect solvers, examples](https://ct.gitlabpages.inria.fr/gallery//notebooks.html)

# OptimalControl.jl
- [Basic example: double integrator](https://control-toolbox.org/docs/optimalcontrol/dev/tutorial-basic-example-f.html)
- [Basic example: double integrator (cont'ed)](https://control-toolbox.org/docs/optimalcontrol/dev/tutorial-basic-example.html)
- [Basic example: double integrator (1/3)](https://control-toolbox.org/docs/optimalcontrol/dev/tutorial-basic-example-f.html)
- [Basic example: double integrator (2/3)](https://control-toolbox.org/docs/optimalcontrol/dev/tutorial-basic-example.html)
- [Basic example: double integrator (3/3)](https://control-toolbox.org/docs/optimalcontrol/dev/tutorial-double-integrator.html)
- [Advanced example: Goddard problem](https://control-toolbox.org/docs/optimalcontrol/dev/tutorial-goddard.html)

# Wrap up
Expand Down

0 comments on commit 53b2ac6

Please sign in to comment.