Skip to content

Commit 7423cf3

Browse files
authored
Merge pull request #62 from control-toolbox/v2
Tutorials with OptimalControl v2
2 parents 21b5054 + 5225f9a commit 7423cf3

17 files changed

Lines changed: 1423 additions & 868 deletions

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "Tutorials"
22
uuid = "cb10daa6-a5e5-4c25-a171-ae181b8ea3c9"
33
authors = ["Olivier Cots <olivier.cots@toulouse-inp.fr>"]
4-
version = "0.3.2"
4+
version = "0.4.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
@@ -26,11 +26,11 @@ DocumenterInterLinks = "1"
2626
ForwardDiff = "0.10, 1"
2727
LinearAlgebra = "1"
2828
MINPACK = "1"
29-
MadNLP = "0.8"
29+
MadNLP = "0.9"
3030
NLPModels = "0.21"
3131
NLPModelsIpopt = "0.11"
3232
NonlinearSolve = "4"
33-
OptimalControl = "1"
33+
OptimalControl = "2"
3434
OrdinaryDiffEq = "6"
3535
Plots = "1"
3636
Printf = "1"

docs/make.jl

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# to run the documentation generation:
2+
# julia --project=. docs/make.jl
3+
pushfirst!(LOAD_PATH, joinpath(@__DIR__, ".."))
4+
pushfirst!(LOAD_PATH, @__DIR__)
5+
16
using Documenter
27
using DocumenterInterLinks
38
using OptimalControl
@@ -16,7 +21,9 @@ links = InterLinks(
1621
),
1722
)
1823

19-
# For reproducibility
24+
# ═══════════════════════════════════════════════════════════════════════════════
25+
# Assets for reproducibility
26+
# ═══════════════════════════════════════════════════════════════════════════════
2027
mkpath(joinpath(@__DIR__, "src", "assets"))
2128
cp(
2229
joinpath(@__DIR__, "Manifest.toml"),
@@ -31,21 +38,32 @@ cp(
3138

3239
repo_url = "github.com/control-toolbox/Tutorials.jl"
3340

34-
# if draft is true, then the julia code from .md is not executed # debug
41+
# ═══════════════════════════════════════════════════════════════════════════════
42+
# Configuration
43+
# ═══════════════════════════════════════════════════════════════════════════════
44+
# if draft is true, then the julia code from .md is not executed
3545
# to disable the draft mode in a specific markdown file, use the following:
3646
#=
3747
```@meta
3848
Draft = false
3949
```
4050
=#
51+
draft = false # Draft mode: if true, @example blocks in markdown are not executed
52+
53+
# ═══════════════════════════════════════════════════════════════════════════════
54+
# Build documentation
55+
# ═══════════════════════════════════════════════════════════════════════════════
4156
makedocs(;
42-
draft=false,
43-
warnonly=[:cross_references, :autodocs_block],
57+
draft=draft,
58+
warnonly=[:cross_references, :autodocs_block, :external_cross_references],
4459
sitename="Tutorials",
4560
format=Documenter.HTML(;
4661
repolink="https://" * repo_url,
4762
prettyurls=false,
48-
size_threshold_ignore=[""],
63+
size_threshold_ignore=[
64+
"tutorial-discretisation.md",
65+
"tutorial-nlp.md",
66+
],
4967
assets=[
5068
asset("https://control-toolbox.org/assets/css/documentation.css"),
5169
asset("https://control-toolbox.org/assets/js/documentation.js"),

0 commit comments

Comments
 (0)