Skip to content

Commit e4ea0f4

Browse files
authored
Merge pull request #164 from control-toolbox/auto-juliaformatter-pr
[AUTO] JuliaFormatter.jl run
2 parents 359681b + d1f1793 commit e4ea0f4

File tree

3 files changed

+8
-22
lines changed

3 files changed

+8
-22
lines changed

docs/make.jl

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ API_PAGES = [
3838
"times.md",
3939
"types.md",
4040
"utils.md",
41-
"variable.md"
41+
"variable.md",
4242
]
4343

4444
makedocs(;
@@ -54,10 +54,7 @@ makedocs(;
5454
asset("https://control-toolbox.org/assets/js/documentation.js"),
5555
],
5656
),
57-
pages=[
58-
"Introduction" => "index.md",
59-
"API" => API_PAGES,
60-
],
57+
pages=["Introduction" => "index.md", "API" => API_PAGES],
6158
checkdocs=:none,
6259
)
6360

ext/CTModelsPlots.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ include("plot_utils.jl")
1616
include("plot_default.jl")
1717
include("plot.jl")
1818

19-
end
19+
end

test/test_export_import.jl

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,13 @@ function test_export_import()
1212

1313
# JSON
1414
CTModels.export_ocp_solution(sol; filename="solution_test", format=:JSON)
15-
sol_reloaded = CTModels.import_ocp_solution(
16-
ocp; filename="solution_test", format=:JSON
17-
)
15+
sol_reloaded = CTModels.import_ocp_solution(ocp; filename="solution_test", format=:JSON)
1816
@test sol.objective sol_reloaded.objective atol=1e-8
1917
@test CTModels.objective(sol) CTModels.objective(sol_reloaded) atol=1e-8
2018

2119
# JLD
2220
CTModels.export_ocp_solution(sol; filename="solution_test") # default is :JLD)
23-
sol_reloaded = CTModels.import_ocp_solution(
24-
ocp; filename="solution_test", format=:JLD
25-
)
21+
sol_reloaded = CTModels.import_ocp_solution(ocp; filename="solution_test", format=:JLD)
2622
@test sol.objective sol_reloaded.objective atol=1e-8
2723
@test CTModels.objective(sol) CTModels.objective(sol_reloaded) atol=1e-8
2824

@@ -31,17 +27,13 @@ function test_export_import()
3127

3228
# JSON
3329
CTModels.export_ocp_solution(sol; filename="solution_test", format=:JSON)
34-
sol_reloaded = CTModels.import_ocp_solution(
35-
ocp; filename="solution_test", format=:JSON
36-
)
30+
sol_reloaded = CTModels.import_ocp_solution(ocp; filename="solution_test", format=:JSON)
3731
@test sol.objective sol_reloaded.objective atol=1e-8
3832
@test CTModels.objective(sol) CTModels.objective(sol_reloaded) atol=1e-8
3933

4034
# JLD
4135
CTModels.export_ocp_solution(sol; filename="solution_test", format=:JLD)
42-
sol_reloaded = CTModels.import_ocp_solution(
43-
ocp; filename="solution_test", format=:JLD
44-
)
36+
sol_reloaded = CTModels.import_ocp_solution(ocp; filename="solution_test", format=:JLD)
4537
@test sol.objective sol_reloaded.objective atol=1e-8
4638
@test CTModels.objective(sol) CTModels.objective(sol_reloaded) atol=1e-8
4739

@@ -68,14 +60,11 @@ function test_export_import()
6860

6961
# JSON
7062
CTModels.export_ocp_solution(sol; filename="solution_test", format=:JSON)
71-
sol_reloaded = CTModels.import_ocp_solution(
72-
ocp; filename="solution_test", format=:JSON
73-
)
63+
sol_reloaded = CTModels.import_ocp_solution(ocp; filename="solution_test", format=:JSON)
7464
@test sol.objective sol_reloaded.objective atol=1e-8
7565
@test CTModels.objective(sol) CTModels.objective(sol_reloaded) atol=1e-8
7666

7767
# Cleanup
7868
remove_if_exists("solution_test.jld2")
7969
remove_if_exists("solution_test.json")
80-
8170
end

0 commit comments

Comments
 (0)