Skip to content

Commit f9ffa03

Browse files
authored
Merge pull request #317 from control-toolbox/auto-juliaformatter-pr
[AUTO] JuliaFormatter.jl run
2 parents 060ac84 + e76821b commit f9ffa03

36 files changed

+2384
-2497
lines changed

docs/make.jl

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ using DocumenterMermaid
55
repo_url = "github.com/control-toolbox/CTBase.jl"
66

77
makedocs(;
8-
warnonly = [:cross_references, :autodocs_block],
9-
sitename = "CTBase.jl",
10-
format = Documenter.HTML(
11-
repolink = "https://" * repo_url,
12-
prettyurls = false,
13-
size_threshold_ignore = ["api.md", "dev.md"],
14-
assets = [
8+
warnonly=[:cross_references, :autodocs_block],
9+
sitename="CTBase.jl",
10+
format=Documenter.HTML(;
11+
repolink="https://" * repo_url,
12+
prettyurls=false,
13+
size_threshold_ignore=["api.md", "dev.md"],
14+
assets=[
1515
asset("https://control-toolbox.org/assets/css/documentation.css"),
1616
asset("https://control-toolbox.org/assets/js/documentation.js"),
1717
],
1818
),
19-
pages = ["Introduction" => "index.md", "API" => "api.md", "Developers" => "dev.md"],
20-
checkdocs = :none,
19+
pages=["Introduction" => "index.md", "API" => "api.md", "Developers" => "dev.md"],
20+
checkdocs=:none,
2121
)
2222

23-
deploydocs(; repo = repo_url * ".git", devbranch = "main")
23+
deploydocs(; repo=repo_url * ".git", devbranch="main")

ext/CTBaseLoadSave.jl

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ $(TYPEDSIGNATURES)
1111
1212
Export OCP solution in JLD / JSON format
1313
"""
14-
function CTBase.export_ocp_solution(sol::OptimalControlSolution; filename_prefix = "solution", format = :JLD)
14+
function CTBase.export_ocp_solution(
15+
sol::OptimalControlSolution; filename_prefix="solution", format=:JLD
16+
)
1517
if format == :JLD
1618
save_object(filename_prefix * ".jld2", sol)
1719
elseif format == :JSON
@@ -37,28 +39,28 @@ $(TYPEDSIGNATURES)
3739
3840
Read OCP solution in JLD / JSON format
3941
"""
40-
function CTBase.import_ocp_solution(ocp::OptimalControlModel; filename_prefix = "solution", format = :JLD)
41-
42+
function CTBase.import_ocp_solution(
43+
ocp::OptimalControlModel; filename_prefix="solution", format=:JLD
44+
)
4245
if format == :JLD
4346
return load_object(filename_prefix * ".jld2")
44-
elseif format == :JSON
47+
elseif format == :JSON
4548
json_string = read(filename_prefix * ".json", String)
4649
blob = JSON3.read(json_string)
4750

4851
# NB. convert vect{vect} to matrix
4952
return OptimalControlSolution(
5053
ocp,
5154
blob.time_grid,
52-
stack(blob.state, dims = 1),
53-
stack(blob.control, dims = 1),
55+
stack(blob.state; dims=1),
56+
stack(blob.control; dims=1),
5457
blob.variable,
55-
stack(blob.costate, dims = 1);
56-
objective = blob.objective,
58+
stack(blob.costate; dims=1);
59+
objective=blob.objective,
5760
)
5861
else
5962
error("Export_ocp_solution: unknow format (should be :JLD or :JSON): ", format)
60-
end
63+
end
6164
end
6265

63-
6466
end

0 commit comments

Comments
 (0)