From 12f4db7547a137a334d416a8c4779801a1f106d0 Mon Sep 17 00:00:00 2001 From: ocots <66357348+ocots@users.noreply.github.com> Date: Thu, 12 Nov 2026 00:33:10 +0000 Subject: [PATCH] Format .jl files --- docs/make.jl | 2 +- docs/modelings.jl | 10 ++- docs/problems.jl | 4 +- docs/results.jl | 4 +- docs/status.jl | 6 +- ext/JuMPModels/beam.jl | 4 +- ext/JuMPModels/bioreactor.jl | 4 +- ext/JuMPModels/brachistochrone.jl | 6 +- ext/JuMPModels/chain.jl | 6 +- ext/JuMPModels/dielectrophoretic_particle.jl | 4 +- ext/JuMPModels/moonlander.jl | 3 +- ext/JuMPModels/robbins.jl | 6 +- ext/JuMPModels/schemes/tableaux.jl | 2 +- ext/JuMPModels/steering.jl | 5 +- ext/MetaData/balanced_field.jl | 9 ++- ext/MetaData/beam.jl | 8 ++- ext/MetaData/brachistochrone.jl | 22 ++++--- ext/MetaData/glider.jl | 29 ++++----- ext/MetaData/jackson.jl | 7 ++- ext/MetaData/robbins.jl | 7 ++- ext/MetaData/robot.jl | 25 ++++---- ext/MetaData/rocket.jl | 24 +++---- ext/MetaData/space_shuttle.jl | 37 +++++------ ext/MetaData/steering.jl | 15 +++-- ext/MetaData/vanderpol.jl | 7 ++- ext/ModelingToolkitModels.jl | 1 - ext/ModelingToolkitModels/bryson_denham.jl | 9 +-- ext/ModelingToolkitModels/jackson.jl | 4 +- ext/ModelingToolkitModels/robbins.jl | 12 ++-- ext/ModelingToolkitModels/vanderpol.jl | 9 +-- ext/OptimalControlModels/balanced_field.jl | 8 +-- ext/OptimalControlModels/beam.jl | 8 +-- ext/OptimalControlModels/bioreactor.jl | 8 +-- ext/OptimalControlModels/brachistochrone.jl | 8 +-- ext/OptimalControlModels/bryson_denham.jl | 8 +-- ext/OptimalControlModels/cart_pendulum.jl | 8 +-- ext/OptimalControlModels/chain.jl | 8 +-- .../dielectrophoretic_particle.jl | 16 +++-- ext/OptimalControlModels/double_oscillator.jl | 8 +-- ext/OptimalControlModels/ducted_fan.jl | 8 +-- ext/OptimalControlModels/electric_vehicle.jl | 8 +-- ext/OptimalControlModels/glider.jl | 8 +-- ext/OptimalControlModels/insurance.jl | 8 +-- ext/OptimalControlModels/jackson.jl | 8 +-- ext/OptimalControlModels/moonlander.jl | 8 +-- ext/OptimalControlModels/mountain_car.jl | 8 +-- ext/OptimalControlModels/robbins.jl | 8 +-- ext/OptimalControlModels/robot.jl | 8 +-- ext/OptimalControlModels/rocket.jl | 8 +-- ext/OptimalControlModels/space_shuttle.jl | 8 +-- ext/OptimalControlModels/steering.jl | 8 +-- ext/OptimalControlModels/vanderpol.jl | 8 +-- .../balanced_field.jl | 8 ++- ext/OptimalControlScalarizedModels/beam.jl | 4 +- .../brachistochrone.jl | 8 ++- .../bryson_denham.jl | 8 ++- ext/OptimalControlScalarizedModels/chain.jl | 4 +- .../dielectrophoretic_particle.jl | 8 ++- .../double_oscillator.jl | 8 ++- .../ducted_fan.jl | 4 +- .../electric_vehicle.jl | 8 ++- ext/OptimalControlScalarizedModels/glider.jl | 4 +- .../insurance.jl | 4 +- ext/OptimalControlScalarizedModels/jackson.jl | 4 +- .../mountain_car.jl | 8 ++- ext/OptimalControlScalarizedModels/robbins.jl | 4 +- ext/OptimalControlScalarizedModels/robot.jl | 4 +- ext/OptimalControlScalarizedModels/rocket.jl | 4 +- .../space_shuttle.jl | 8 ++- .../steering.jl | 4 +- .../vanderpol.jl | 4 +- src/OptimalControlProblems.jl | 5 +- test/common/comparison.jl | 3 +- test/common/configs.jl | 8 ++- test/common/continuous.jl | 60 +++++++++++++----- test/common/continuous_modelingtoolkit.jl | 7 ++- test/common/equivalence.jl | 2 +- test/common/modeling_tests.jl | 15 +++-- test/common/modelingtoolkit_tests.jl | 7 ++- test/common/optimalcontrol_tests.jl | 4 +- test/common/selection.jl | 4 +- test/common/solve_modelingtoolkit.jl | 18 +++--- test/common/solve_optimalcontrol.jl | 6 +- test/common/status.jl | 11 ++-- test/cron/JuMP/test_convergence.jl | 20 ++++-- test/cron/ModelingToolkit/test_convergence.jl | 8 ++- test/cron/OptimalControl/test_convergence.jl | 8 ++- .../test_convergence.jl | 8 ++- test/robustness/JuMP/test_robustness.jl | 19 ++++-- .../OptimalControl/test_robustness.jl | 14 ++++- test/runtests.jl | 19 ++++-- test/suite/GPU/test_smoke_optimalcontrol.jl | 14 ++++- test/suite/GPU/test_smoke_scalarized.jl | 14 ++++- test/suite/JuMP/test_build.jl | 9 +-- test/suite/JuMP/test_contract.jl | 26 ++++++-- test/suite/JuMP/test_draft.jl | 4 +- test/suite/JuMP/test_methods.jl | 3 +- test/suite/JuMP/test_signs.jl | 17 +++-- test/suite/JuMP/test_smoke.jl | 21 +++++-- test/suite/JuMP/test_tableaux.jl | 2 +- test/suite/ModelingToolkit/test_problem.jl | 6 +- test/suite/ModelingToolkit/test_smoke.jl | 6 +- test/suite/OptimalControl/test_features.jl | 9 ++- test/suite/OptimalControl/test_methods.jl | 10 ++- test/suite/OptimalControl/test_problem.jl | 8 ++- .../OptimalControl/test_reference_solution.jl | 11 +++- test/suite/OptimalControl/test_smoke.jl | 8 ++- .../OptimalControlScalarized/test_methods.jl | 10 ++- .../OptimalControlScalarized/test_problem.jl | 8 ++- .../OptimalControlScalarized/test_smoke.jl | 8 ++- test/suite/comparison/test_features.jl | 4 +- test/suite/comparison/test_modelings.jl | 4 +- test/suite/core/test_consistency.jl | 63 ++++++++++++++----- test/suite/core/test_modelings.jl | 16 +++-- test/suite/core/test_parameters.jl | 11 +++- test/suite/core/test_runner.jl | 19 ++++-- tools/references/references.jl | 31 ++++++--- tools/references/update.jl | 13 ++-- 118 files changed, 749 insertions(+), 435 deletions(-) diff --git a/docs/make.jl b/docs/make.jl index 7dc1f620a..c2e2a4480 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -91,7 +91,7 @@ deploy_decision = Documenter.deploy_folder( with_status_page() do status_file with_problems_browser() do browser_file with_api_reference(src_dir, ext_dir) do api_pages - makedocs(; + return makedocs(; draft=draft, warnonly=:cross_references, sitename="OptimalControlProblems.jl", diff --git a/docs/modelings.jl b/docs/modelings.jl index 1538c4fe9..c57f2dd22 100644 --- a/docs/modelings.jl +++ b/docs/modelings.jl @@ -101,8 +101,12 @@ for spec in OptimalControlProblems.Modelings.MODELING_SPECS end """The modelings, in the order of the modeling table, as `(spec, adapter)` pairs.""" -modelings() = - [(spec, ADAPTERS[spec.name]) for spec in OptimalControlProblems.Modelings.MODELING_SPECS] +function modelings() + return [ + (spec, ADAPTERS[spec.name]) for + spec in OptimalControlProblems.Modelings.MODELING_SPECS + ] +end """The modelings in which `problem` exists, whatever its status there.""" function modelings(problem::Symbol) @@ -128,7 +132,7 @@ function model_excerpt(text::AbstractString, start::Regex) last = findnext(eachindex(lines), first + 1) do i l = lines[i] isempty(strip(l)) && return false - length(l) - length(lstrip(l)) == indent && startswith(lstrip(l), r"end|\)") + return length(l) - length(lstrip(l)) == indent && startswith(lstrip(l), r"end|\)") end block = lines[first:something(last, length(lines))] pad = " "^indent diff --git a/docs/problems.jl b/docs/problems.jl index 2674eae0e..cb979dd3a 100644 --- a/docs/problems.jl +++ b/docs/problems.jl @@ -373,7 +373,9 @@ function compare_panel(problem::Symbol, mods, refs) """ for (i, s) in enumerate(solutions) counts = map(mods) do (spec, _) - n = count(c -> first(split(c)) == string(spec.name), s["configurations"]) + n = count( + c -> first(split(c)) == string(spec.name), s["configurations"] + ) return n == 0 ? "—" : string(n) end label = i == 1 ? "best" : "local $(i - 1)" diff --git a/docs/results.jl b/docs/results.jl index 13dcf6364..dcfcc4925 100644 --- a/docs/results.jl +++ b/docs/results.jl @@ -169,8 +169,8 @@ function thumbnails(results::SolveResults) order = [string(spec.name) for (spec, _) in modelings(problem)] candidates = [ e for e in page_entries(problem) if !isnothing(e["trajectory"]) && - e["scope"] == e["modeling"] && - e["modeling"] in order + e["scope"] == e["modeling"] && + e["modeling"] in order ] isempty(candidates) && continue e = first( diff --git a/docs/status.jl b/docs/status.jl index 21e3772e7..6793f3f84 100644 --- a/docs/status.jl +++ b/docs/status.jl @@ -67,7 +67,7 @@ function status_table() for problem in OptimalControlProblems.problems(; status=:all) statuses = OptimalControlProblems.status(problem) cells = map(mods) do (spec, _) - haskey(statuses, spec.name) ? string(statuses[spec.name]) : "—" + return haskey(statuses, spec.name) ? string(statuses[spec.name]) : "—" end refs = references(problem) table = get(refs, "trapeze", nothing) @@ -103,8 +103,8 @@ function reports_section(reports) # (`new` only says that the configuration was not in the previous run) notable = [ r for r in rows if r["result"] != "converged" || - get(r, "solution", "best") ∉ ("best", "") || - get(r, "change", "") ∉ ("", "new") + get(r, "solution", "best") ∉ ("best", "") || + get(r, "change", "") ∉ ("", "new") ] if isempty(notable) out *= "Every solve converged to the best known solution.\n\n" diff --git a/ext/JuMPModels/beam.jl b/ext/JuMPModels/beam.jl index f63777fd3..f64db5d91 100644 --- a/ext/JuMPModels/beam.jl +++ b/ext/JuMPModels/beam.jl @@ -39,9 +39,7 @@ function OptimalControlProblems.beam( x₂_tf = params[:x₂_tf] data = ProblemData(; - state=[ - Component("x₁"; lower=x₁_l, upper=x₁_u), Component("x₂") - ], + state=[Component("x₁"; lower=x₁_l, upper=x₁_u), Component("x₂")], control=[Component("u")], costate=["∂x₁", "∂x₂"], times=v -> (t0, tf), diff --git a/ext/JuMPModels/bioreactor.jl b/ext/JuMPModels/bioreactor.jl index ed9c3cdf8..fe839dd2c 100644 --- a/ext/JuMPModels/bioreactor.jl +++ b/ext/JuMPModels/bioreactor.jl @@ -66,9 +66,7 @@ function OptimalControlProblems.bioreactor( data = ProblemData(; state=[ - Component("y"; lower=y_l), - Component("s"; lower=s_l), - Component("b"; lower=b_l), + Component("y"; lower=y_l), Component("s"; lower=s_l), Component("b"; lower=b_l) ], control=[Component("u"; lower=u_l, upper=u_u)], costate=["∂y", "∂s", "∂b"], diff --git a/ext/JuMPModels/brachistochrone.jl b/ext/JuMPModels/brachistochrone.jl index acbc15835..b45ee9ae0 100644 --- a/ext/JuMPModels/brachistochrone.jl +++ b/ext/JuMPModels/brachistochrone.jl @@ -40,11 +40,7 @@ function OptimalControlProblems.brachistochrone( u_max = params[:u_max] data = ProblemData(; - state=[ - Component("px"), - Component("py"), - Component("v"), - ], + state=[Component("px"), Component("py"), Component("v")], control=[Component("u"; lower=-1.57, upper=1.57)], variable=[Component("tf"; lower=0.1, upper=20.0)], costate=["∂px", "∂py", "∂v"], diff --git a/ext/JuMPModels/chain.jl b/ext/JuMPModels/chain.jl index 333addfc4..24d4496b0 100644 --- a/ext/JuMPModels/chain.jl +++ b/ext/JuMPModels/chain.jl @@ -41,11 +41,7 @@ function OptimalControlProblems.chain( x₃_tf = L data = ProblemData(; - state=[ - Component("x₁"), - Component("x₂"), - Component("x₃"), - ], + state=[Component("x₁"), Component("x₂"), Component("x₃")], control=[Component("u")], costate=["∂x₁", "∂x₂", "∂x₃"], times=v -> (t0, tf), diff --git a/ext/JuMPModels/dielectrophoretic_particle.jl b/ext/JuMPModels/dielectrophoretic_particle.jl index a2f17820d..7d78637b1 100644 --- a/ext/JuMPModels/dielectrophoretic_particle.jl +++ b/ext/JuMPModels/dielectrophoretic_particle.jl @@ -54,6 +54,8 @@ function OptimalControlProblems.dielectrophoretic_particle( ], ) # initial guess: from the metadata (#377), unless given - init = OptimalControlProblems.Metadata._initial_guess(:dielectrophoretic_particle, params, init) + init = OptimalControlProblems.Metadata._initial_guess( + :dielectrophoretic_particle, params, init + ) return build(data, grid_size, scheme, ordering, args...; init=init, kwargs...) end diff --git a/ext/JuMPModels/moonlander.jl b/ext/JuMPModels/moonlander.jl index b3eba9268..a25bbb269 100644 --- a/ext/JuMPModels/moonlander.jl +++ b/ext/JuMPModels/moonlander.jl @@ -85,8 +85,7 @@ function OptimalControlProblems.moonlander( Component("dθ"), ], control=[ - Component("F₁"; lower=F₁_l, upper=F₁_u), - Component("F₂"; lower=F₂_l, upper=F₂_u), + Component("F₁"; lower=F₁_l, upper=F₁_u), Component("F₂"; lower=F₂_l, upper=F₂_u) ], variable=[Component("tf"; lower=tf_l, upper=tf_u)], costate=["∂p₁", "∂p₂", "∂dp₁", "∂dp₂", "∂θ", "∂dθ"], diff --git a/ext/JuMPModels/robbins.jl b/ext/JuMPModels/robbins.jl index cd27e2b29..a11a048f9 100644 --- a/ext/JuMPModels/robbins.jl +++ b/ext/JuMPModels/robbins.jl @@ -43,11 +43,7 @@ function OptimalControlProblems.robbins( x₃_tf = params[:x₃_tf] data = ProblemData(; - state=[ - Component("x₁"; lower=x₁_l), - Component("x₂"), - Component("x₃"), - ], + state=[Component("x₁"; lower=x₁_l), Component("x₂"), Component("x₃")], control=[Component("u")], costate=["∂x₁", "∂x₂", "∂x₃"], times=v -> (t0, tf), diff --git a/ext/JuMPModels/schemes/tableaux.jl b/ext/JuMPModels/schemes/tableaux.jl index 6e860184f..c79767c9d 100644 --- a/ext/JuMPModels/schemes/tableaux.jl +++ b/ext/JuMPModels/schemes/tableaux.jl @@ -100,7 +100,7 @@ function stage_positions(tab::ButcherTableau) θ = map(1:s) do j iszero(tab.A[j, :]) && return 0.0 tab.A[j, :] == tab.b && return 1.0 - throw( + return throw( CTBase.Exceptions.NotImplemented( "Stage $j of the tableau $(tab.name) is not a node of the step"; required_method="stage unknowns in the JuMP models", diff --git a/ext/JuMPModels/steering.jl b/ext/JuMPModels/steering.jl index 92a17ec9e..efd1629db 100644 --- a/ext/JuMPModels/steering.jl +++ b/ext/JuMPModels/steering.jl @@ -43,10 +43,7 @@ function OptimalControlProblems.steering( x₄_tf = params[:x₄_tf] data = ProblemData(; - state=[ - Component("x$(c)") for - (k, c) in enumerate("₁₂₃₄") - ], + state=[Component("x$(c)") for (k, c) in enumerate("₁₂₃₄")], control=[Component("u"; lower=u_min, upper=u_max)], variable=[Component("tf"; lower=tf_l)], costate=["∂x₁", "∂x₂", "∂x₃", "∂x₄"], diff --git a/ext/MetaData/balanced_field.jl b/ext/MetaData/balanced_field.jl index 2fbfb1f60..1856e72af 100644 --- a/ext/MetaData/balanced_field.jl +++ b/ext/MetaData/balanced_field.jl @@ -28,7 +28,10 @@ balanced_field_meta = OrderedDict( ), :status => (OptimalControl=:valid, OptimalControlScalarized=:valid, JuMP=:valid), # initial guess of every modeling (#377), from the parameters - :init => p -> ( - state=[p.r_t0, p.v_t0 + 10.0, p.h_tf / 2.0, p.γ_tf], control=0.1, variable=10.0 - ), + :init => + p -> ( + state=[p.r_t0, p.v_t0 + 10.0, p.h_tf / 2.0, p.γ_tf], + control=0.1, + variable=10.0, + ), ) diff --git a/ext/MetaData/beam.jl b/ext/MetaData/beam.jl index 94f63d6d5..867cc6a8b 100644 --- a/ext/MetaData/beam.jl +++ b/ext/MetaData/beam.jl @@ -6,6 +6,12 @@ beam_meta = OrderedDict( :init => p -> (state=[0.05, 0.1], control=0.1), :reference_solution => p -> _bryson_denham_solution( - p.t0, p.tf, (p.x₁_t0, p.x₂_t0), (p.x₁_tf, p.x₂_tf), p.x₁_u; weight=1, lower=p.x₁_l + p.t0, + p.tf, + (p.x₁_t0, p.x₂_t0), + (p.x₁_tf, p.x₂_tf), + p.x₁_u; + weight=1, + lower=p.x₁_l, ), ) diff --git a/ext/MetaData/brachistochrone.jl b/ext/MetaData/brachistochrone.jl index b1f49f85e..de97f204a 100644 --- a/ext/MetaData/brachistochrone.jl +++ b/ext/MetaData/brachistochrone.jl @@ -13,14 +13,16 @@ brachistochrone_meta = OrderedDict( ), :status => (OptimalControl=:valid, OptimalControlScalarized=:valid, JuMP=:valid), # initial guess of every modeling (#377), from the parameters - :init => p -> begin - (; t0, x0, y0, v0, xf, yf) = p - tf = 2.0 - s(t) = (t - t0) / (tf - t0) - return ( - state=t -> [x0 + s(t) * (xf - x0), y0 + s(t) * (yf - y0), v0 + s(t) * 10.0], - control=1.57, - variable=tf, - ) - end, + :init => + p -> begin + (; t0, x0, y0, v0, xf, yf) = p + tf = 2.0 + s(t) = (t - t0) / (tf - t0) + return ( + state=t -> + [x0 + s(t) * (xf - x0), y0 + s(t) * (yf - y0), v0 + s(t) * 10.0], + control=1.57, + variable=tf, + ) + end, ) diff --git a/ext/MetaData/glider.jl b/ext/MetaData/glider.jl index d92a11aef..ec22386a7 100644 --- a/ext/MetaData/glider.jl +++ b/ext/MetaData/glider.jl @@ -25,18 +25,19 @@ glider_meta = OrderedDict( ), :status => (OptimalControl=:valid, OptimalControlScalarized=:valid, JuMP=:valid), # initial guess of every modeling (#377), from the parameters - :init => p -> begin - (; x_t0, y_t0, y_tf, vx_t0, vx_tf, vy_t0, vy_tf) = p - tf = 100.0 - return ( - state=t -> [ - x_t0 + (t / tf) * 1248.0, - y_t0 + (t / tf) * (y_tf - y_t0), - vx_t0 + (t / tf) * (vx_tf - vx_t0), - vy_t0 + (t / tf) * (vy_tf - vy_t0), - ], - control=1.0, - variable=tf, - ) - end, + :init => + p -> begin + (; x_t0, y_t0, y_tf, vx_t0, vx_tf, vy_t0, vy_tf) = p + tf = 100.0 + return ( + state=t -> [ + x_t0 + (t / tf) * 1248.0, + y_t0 + (t / tf) * (y_tf - y_t0), + vx_t0 + (t / tf) * (vx_tf - vx_t0), + vy_t0 + (t / tf) * (vy_tf - vy_t0), + ], + control=1.0, + variable=tf, + ) + end, ) diff --git a/ext/MetaData/jackson.jl b/ext/MetaData/jackson.jl index bd3f1e8bc..a972e75d7 100644 --- a/ext/MetaData/jackson.jl +++ b/ext/MetaData/jackson.jl @@ -18,7 +18,12 @@ jackson_meta = OrderedDict( b_t0=0, x₃_t0=0, ), - :status => (OptimalControl=:valid, OptimalControlScalarized=:valid, JuMP=:valid, ModelingToolkit=:valid), + :status => ( + OptimalControl=:valid, + OptimalControlScalarized=:valid, + JuMP=:valid, + ModelingToolkit=:valid, + ), # initial guess of every modeling (#377), from the parameters :init => p -> (state=[0.1, 0.1, 0.1], control=0.1), ) diff --git a/ext/MetaData/robbins.jl b/ext/MetaData/robbins.jl index 0524af68f..53de25e99 100644 --- a/ext/MetaData/robbins.jl +++ b/ext/MetaData/robbins.jl @@ -14,7 +14,12 @@ robbins_meta = OrderedDict( x₂_tf=0, x₃_tf=0, ), - :status => (OptimalControl=:valid, OptimalControlScalarized=:valid, JuMP=:valid, ModelingToolkit=:valid), + :status => ( + OptimalControl=:valid, + OptimalControlScalarized=:valid, + JuMP=:valid, + ModelingToolkit=:valid, + ), # initial guess of every modeling (#377), from the parameters :init => p -> (state=[0.1, 0.1, 0.1], control=0.1), ) diff --git a/ext/MetaData/robot.jl b/ext/MetaData/robot.jl index b189d30c5..4807dc096 100644 --- a/ext/MetaData/robot.jl +++ b/ext/MetaData/robot.jl @@ -34,15 +34,18 @@ robot_meta = OrderedDict( ), :status => (OptimalControl=:valid, OptimalControlScalarized=:valid, JuMP=:valid), # initial guess of every modeling (#377), from the parameters - :init => p -> begin - (; t0, ρ_t0, θ_t0, ϕ_t0, ρ_tf, θ_tf, ϕ_tf) = p - tf = 9.1 - function state(t) - s = clamp((t - t0) / (tf - t0), 0.0, 1.0) - ϕ = ϕ_t0 + s * (ϕ_tf - ϕ_t0) - abs(ϕ) < 1e-6 && (ϕ = 1e-6) # away from zero: the dynamics divide by sin(ϕ)² - return [ρ_t0 + s * (ρ_tf - ρ_t0), 0.0, θ_t0 + s * (θ_tf - θ_t0), 0.0, ϕ, 0.0] - end - return (state=state, control=[0.0, 0.0, 0.0], variable=tf) - end, + :init => + p -> begin + (; t0, ρ_t0, θ_t0, ϕ_t0, ρ_tf, θ_tf, ϕ_tf) = p + tf = 9.1 + function state(t) + s = clamp((t - t0) / (tf - t0), 0.0, 1.0) + ϕ = ϕ_t0 + s * (ϕ_tf - ϕ_t0) + abs(ϕ) < 1e-6 && (ϕ = 1e-6) # away from zero: the dynamics divide by sin(ϕ)² + return [ + ρ_t0 + s * (ρ_tf - ρ_t0), 0.0, θ_t0 + s * (θ_tf - θ_t0), 0.0, ϕ, 0.0 + ] + end + return (state=state, control=[0.0, 0.0, 0.0], variable=tf) + end, ) diff --git a/ext/MetaData/rocket.jl b/ext/MetaData/rocket.jl index c2d8b9181..4b6e80d6e 100644 --- a/ext/MetaData/rocket.jl +++ b/ext/MetaData/rocket.jl @@ -4,15 +4,17 @@ rocket_meta = OrderedDict( (t0=0, h_t0=1, v_t0=0, m_t0=1, g0=1, Tc=3.5, hc=500, vc=620, mc=0.6, T_l=0, tf_l=0), :status => (OptimalControl=:valid, OptimalControlScalarized=:valid, JuMP=:valid), # initial guess of every modeling (#377), from the parameters - :init => p -> begin - (; m_t0, mc, Tc, g0) = p - tf = 1 - m_tf = mc * m_t0 - Tmax = Tc * m_t0 * g0 - return ( - state=t -> [1, (t / tf) * (1 - t / tf), (m_tf - m_t0) * (t / tf) + m_t0], - control=Tmax / 2, - variable=tf, - ) - end, + :init => + p -> begin + (; m_t0, mc, Tc, g0) = p + tf = 1 + m_tf = mc * m_t0 + Tmax = Tc * m_t0 * g0 + return ( + state=t -> + [1, (t / tf) * (1 - t / tf), (m_tf - m_t0) * (t / tf) + m_t0], + control=Tmax / 2, + variable=tf, + ) + end, ) diff --git a/ext/MetaData/space_shuttle.jl b/ext/MetaData/space_shuttle.jl index e20e158e2..3d2b9b899 100644 --- a/ext/MetaData/space_shuttle.jl +++ b/ext/MetaData/space_shuttle.jl @@ -51,22 +51,23 @@ space_shuttle_meta = OrderedDict( ), :status => (OptimalControl=:valid, OptimalControlScalarized=:valid, JuMP=:valid), # initial guess of every modeling (#377), from the parameters - :init => p -> begin - (; t0, h_t0, ϕ_t0, θ_t0, v_t0, γ_t0, ψ_t0, h_tf, v_tf, γ_tf, α_s, β_s) = p - # linear interpolation for h, v, γ, constant for the rest - tf = 2000 - s(t) = (t - t0) / (tf - t0) - return ( - state=t -> [ - h_t0 + s(t) * (h_tf - h_t0), - ϕ_t0, - θ_t0, - v_t0 + s(t) * (v_tf - v_t0), - γ_t0 + s(t) * (γ_tf - γ_t0), - ψ_t0, - ], - control=[α_s, β_s], - variable=tf, - ) - end, + :init => + p -> begin + (; t0, h_t0, ϕ_t0, θ_t0, v_t0, γ_t0, ψ_t0, h_tf, v_tf, γ_tf, α_s, β_s) = p + # linear interpolation for h, v, γ, constant for the rest + tf = 2000 + s(t) = (t - t0) / (tf - t0) + return ( + state=t -> [ + h_t0 + s(t) * (h_tf - h_t0), + ϕ_t0, + θ_t0, + v_t0 + s(t) * (v_tf - v_t0), + γ_t0 + s(t) * (γ_tf - γ_t0), + ψ_t0, + ], + control=[α_s, β_s], + variable=tf, + ) + end, ) diff --git a/ext/MetaData/steering.jl b/ext/MetaData/steering.jl index 9aeabd67c..8547a44e1 100644 --- a/ext/MetaData/steering.jl +++ b/ext/MetaData/steering.jl @@ -16,10 +16,13 @@ steering_meta = OrderedDict( ), :status => (OptimalControl=:valid, OptimalControlScalarized=:valid, JuMP=:valid), # initial guess of every modeling (#377), from the parameters - :init => p -> begin - t0 = p.t0 - return ( - state=t -> [0.0, 5.0 * (t - t0), 45.0 * (t - t0), 0.0], control=0, variable=0.6 - ) - end, + :init => + p -> begin + t0 = p.t0 + return ( + state=t -> [0.0, 5.0 * (t - t0), 45.0 * (t - t0), 0.0], + control=0, + variable=0.6, + ) + end, ) diff --git a/ext/MetaData/vanderpol.jl b/ext/MetaData/vanderpol.jl index ca63f37b3..da72a9dc5 100644 --- a/ext/MetaData/vanderpol.jl +++ b/ext/MetaData/vanderpol.jl @@ -1,7 +1,12 @@ vanderpol_meta = OrderedDict( :grid_size => 500, :parameters => (t0=0, tf=2, ω=1, ε=1, x₁_t0=1, x₂_t0=0), - :status => (OptimalControl=:valid, OptimalControlScalarized=:valid, JuMP=:valid, ModelingToolkit=:valid), + :status => ( + OptimalControl=:valid, + OptimalControlScalarized=:valid, + JuMP=:valid, + ModelingToolkit=:valid, + ), # initial guess of every modeling (#377), from the parameters :init => p -> (state=[0.1, 0.1], control=0.1), ) diff --git a/ext/ModelingToolkitModels.jl b/ext/ModelingToolkitModels.jl index 572ff39d7..abb5e95c9 100644 --- a/ext/ModelingToolkitModels.jl +++ b/ext/ModelingToolkitModels.jl @@ -76,4 +76,3 @@ function CTModels.Models.variable_dimension(sys::ModelingToolkit.AbstractSystem) end end # module ModelingToolkitModels - diff --git a/ext/ModelingToolkitModels/bryson_denham.jl b/ext/ModelingToolkitModels/bryson_denham.jl index 75cec4c05..eceac5cd5 100644 --- a/ext/ModelingToolkitModels/bryson_denham.jl +++ b/ext/ModelingToolkitModels/bryson_denham.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:bryson_denham)` and `OptimalControlProblems.status(:bryson_denham)`. """ function OptimalControlProblems.bryson_denham( - ::ModelingToolkitBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::ModelingToolkitBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:bryson_denham, :ModelingToolkit) params = OptimalControlProblems.parameters_data(:bryson_denham, parameters) @@ -32,9 +30,7 @@ function OptimalControlProblems.bryson_denham( eqs = [D(x₁(t)) ~ x₂(t), D(x₂(t)) ~ u(t)] costs = [ModelingToolkit.Symbolics.Integral(t in (t0, tf))(0.5 * u(t)^2)] constraints = [ - x₁(tf) ~ x1_tf, - x₂(tf) ~ x2_tf, - ModelingToolkit.Symbolics.:≲(x₁(t), x1_max), + x₁(tf) ~ x1_tf, x₂(tf) ~ x2_tf, ModelingToolkit.Symbolics.:≲(x₁(t), x1_max) ] ModelingToolkit.@named sys = ModelingToolkit.System( @@ -48,4 +44,3 @@ function OptimalControlProblems.bryson_denham( :bryson_denham, :ModelingToolkit, sys, init, params ) end - diff --git a/ext/ModelingToolkitModels/jackson.jl b/ext/ModelingToolkitModels/jackson.jl index aeb6a5c78..09470735d 100644 --- a/ext/ModelingToolkitModels/jackson.jl +++ b/ext/ModelingToolkitModels/jackson.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:jackson)` and `OptimalControlProblems.status(:jackson)`. """ function OptimalControlProblems.jackson( - ::ModelingToolkitBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::ModelingToolkitBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:jackson, :ModelingToolkit) params = OptimalControlProblems.parameters_data(:jackson, parameters) diff --git a/ext/ModelingToolkitModels/robbins.jl b/ext/ModelingToolkitModels/robbins.jl index 8c9c5ce0b..9c92479cc 100644 --- a/ext/ModelingToolkitModels/robbins.jl +++ b/ext/ModelingToolkitModels/robbins.jl @@ -11,17 +11,19 @@ Default parameters and the modeling status are available through `problem_metadata(:robbins)` and `OptimalControlProblems.status(:robbins)`. """ function OptimalControlProblems.robbins( - ::ModelingToolkitBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::ModelingToolkitBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:robbins, :ModelingToolkit) params = OptimalControlProblems.parameters_data(:robbins, parameters) t0, tf = float(params[:t0]), float(params[:tf]) α, β, γ = params[:α], params[:β], params[:γ] x₁_l = float(params[:x₁_l]) - x₁_t0, x₂_t0, x₃_t0 = float(params[:x₁_t0]), float(params[:x₂_t0]), float(params[:x₃_t0]) - x₁_tf, x₂_tf, x₃_tf = float(params[:x₁_tf]), float(params[:x₂_tf]), float(params[:x₃_tf]) + x₁_t0, x₂_t0, x₃_t0 = float(params[:x₁_t0]), + float(params[:x₂_t0]), + float(params[:x₃_t0]) + x₁_tf, x₂_tf, x₃_tf = float(params[:x₁_tf]), + float(params[:x₂_tf]), + float(params[:x₃_tf]) t = ModelingToolkit.t_nounits D = ModelingToolkit.Differential(t) diff --git a/ext/ModelingToolkitModels/vanderpol.jl b/ext/ModelingToolkitModels/vanderpol.jl index 581125422..3746cf51b 100644 --- a/ext/ModelingToolkitModels/vanderpol.jl +++ b/ext/ModelingToolkitModels/vanderpol.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:vanderpol)` and `OptimalControlProblems.status(:vanderpol)`. """ function OptimalControlProblems.vanderpol( - ::ModelingToolkitBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::ModelingToolkitBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:vanderpol, :ModelingToolkit) params = OptimalControlProblems.parameters_data(:vanderpol, parameters) @@ -28,10 +26,7 @@ function OptimalControlProblems.vanderpol( ModelingToolkit.@variables x₂(..) = x₂_t0 [tunable = false] ModelingToolkit.@variables u(..) [input = true] - eqs = [ - D(x₁(t)) ~ x₂(t), - D(x₂(t)) ~ ε * ω * (1 - x₁(t)^2) * x₂(t) - ω^2 * x₁(t) + u(t), - ] + eqs = [D(x₁(t)) ~ x₂(t), D(x₂(t)) ~ ε * ω * (1 - x₁(t)^2) * x₂(t) - ω^2 * x₁(t) + u(t)] costs = [ ModelingToolkit.Symbolics.Integral(t in (t0, tf))( 0.5 * (x₁(t)^2 + x₂(t)^2 + u(t)^2) diff --git a/ext/OptimalControlModels/balanced_field.jl b/ext/OptimalControlModels/balanced_field.jl index 2b955d8bc..766482335 100644 --- a/ext/OptimalControlModels/balanced_field.jl +++ b/ext/OptimalControlModels/balanced_field.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:balanced_field)` and `OptimalControlProblems.status(:balanced_field)`. """ function OptimalControlProblems.balanced_field( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:balanced_field, :OptimalControl) @@ -96,5 +94,7 @@ function OptimalControlProblems.balanced_field( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:balanced_field, params, init) - return OptimalControlProblems.Problems._problem(:balanced_field, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :balanced_field, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlModels/beam.jl b/ext/OptimalControlModels/beam.jl index da01e96aa..78b4060a6 100644 --- a/ext/OptimalControlModels/beam.jl +++ b/ext/OptimalControlModels/beam.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:beam)` and `OptimalControlProblems.status(:beam)`. """ function OptimalControlProblems.beam( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:beam, :OptimalControl) @@ -46,5 +44,7 @@ function OptimalControlProblems.beam( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:beam, params, init) - return OptimalControlProblems.Problems._problem(:beam, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :beam, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlModels/bioreactor.jl b/ext/OptimalControlModels/bioreactor.jl index 83b4cf932..ed53b6a15 100644 --- a/ext/OptimalControlModels/bioreactor.jl +++ b/ext/OptimalControlModels/bioreactor.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:bioreactor)` and `OptimalControlProblems.status(:bioreactor)`. """ function OptimalControlProblems.bioreactor( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:bioreactor, :OptimalControl) @@ -84,5 +82,7 @@ function OptimalControlProblems.bioreactor( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:bioreactor, params, init) - return OptimalControlProblems.Problems._problem(:bioreactor, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :bioreactor, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlModels/brachistochrone.jl b/ext/OptimalControlModels/brachistochrone.jl index 2c54a184e..3e8c86245 100644 --- a/ext/OptimalControlModels/brachistochrone.jl +++ b/ext/OptimalControlModels/brachistochrone.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:brachistochrone)` and `OptimalControlProblems.status(:brachistochrone)`. """ function OptimalControlProblems.brachistochrone( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:brachistochrone, :OptimalControl) params = parameters_data(:brachistochrone, parameters) @@ -55,5 +53,7 @@ function OptimalControlProblems.brachistochrone( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:brachistochrone, params, init) - return OptimalControlProblems.Problems._problem(:brachistochrone, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :brachistochrone, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlModels/bryson_denham.jl b/ext/OptimalControlModels/bryson_denham.jl index fe412a74e..642a894f5 100644 --- a/ext/OptimalControlModels/bryson_denham.jl +++ b/ext/OptimalControlModels/bryson_denham.jl @@ -12,9 +12,7 @@ Default parameters and the modeling status are available through """ function OptimalControlProblems.bryson_denham( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:bryson_denham, :OptimalControl) params = parameters_data(:bryson_denham, parameters) @@ -41,5 +39,7 @@ function OptimalControlProblems.bryson_denham( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:bryson_denham, params, init) - return OptimalControlProblems.Problems._problem(:bryson_denham, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :bryson_denham, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlModels/cart_pendulum.jl b/ext/OptimalControlModels/cart_pendulum.jl index 666aaaf57..64d723546 100644 --- a/ext/OptimalControlModels/cart_pendulum.jl +++ b/ext/OptimalControlModels/cart_pendulum.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:cart_pendulum)` and `OptimalControlProblems.status(:cart_pendulum)`. """ function OptimalControlProblems.cart_pendulum( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:cart_pendulum, :OptimalControl) @@ -94,5 +92,7 @@ function OptimalControlProblems.cart_pendulum( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:cart_pendulum, params, init) - return OptimalControlProblems.Problems._problem(:cart_pendulum, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :cart_pendulum, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlModels/chain.jl b/ext/OptimalControlModels/chain.jl index 958269d64..b31af3aa7 100644 --- a/ext/OptimalControlModels/chain.jl +++ b/ext/OptimalControlModels/chain.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:chain)` and `OptimalControlProblems.status(:chain)`. """ function OptimalControlProblems.chain( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:chain, :OptimalControl) @@ -60,5 +58,7 @@ function OptimalControlProblems.chain( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:chain, params, init) - return OptimalControlProblems.Problems._problem(:chain, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :chain, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlModels/dielectrophoretic_particle.jl b/ext/OptimalControlModels/dielectrophoretic_particle.jl index 456ea66be..4cf3b1be1 100644 --- a/ext/OptimalControlModels/dielectrophoretic_particle.jl +++ b/ext/OptimalControlModels/dielectrophoretic_particle.jl @@ -11,11 +11,11 @@ Default parameters and the modeling status are available through `problem_metadata(:dielectrophoretic_particle)` and `OptimalControlProblems.status(:dielectrophoretic_particle)`. """ function OptimalControlProblems.dielectrophoretic_particle( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) - OptimalControlProblems.Catalogue._warn_if_draft(:dielectrophoretic_particle, :OptimalControl) + OptimalControlProblems.Catalogue._warn_if_draft( + :dielectrophoretic_particle, :OptimalControl + ) # parameters params = parameters_data(:dielectrophoretic_particle, parameters) @@ -51,7 +51,11 @@ function OptimalControlProblems.dielectrophoretic_particle( end # initial guess: from the metadata (#377), unless given - init = OptimalControlProblems.Metadata._initial_guess(:dielectrophoretic_particle, params, init) + init = OptimalControlProblems.Metadata._initial_guess( + :dielectrophoretic_particle, params, init + ) - return OptimalControlProblems.Problems._problem(:dielectrophoretic_particle, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :dielectrophoretic_particle, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlModels/double_oscillator.jl b/ext/OptimalControlModels/double_oscillator.jl index d7c0cd542..ef84b4866 100644 --- a/ext/OptimalControlModels/double_oscillator.jl +++ b/ext/OptimalControlModels/double_oscillator.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:double_oscillator)` and `OptimalControlProblems.status(:double_oscillator)`. """ function OptimalControlProblems.double_oscillator( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:double_oscillator, :OptimalControl) @@ -62,5 +60,7 @@ function OptimalControlProblems.double_oscillator( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:double_oscillator, params, init) - return OptimalControlProblems.Problems._problem(:double_oscillator, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :double_oscillator, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlModels/ducted_fan.jl b/ext/OptimalControlModels/ducted_fan.jl index 3f4262727..21eddd474 100644 --- a/ext/OptimalControlModels/ducted_fan.jl +++ b/ext/OptimalControlModels/ducted_fan.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:ducted_fan)` and `OptimalControlProblems.status(:ducted_fan)`. """ function OptimalControlProblems.ducted_fan( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:ducted_fan, :OptimalControl) @@ -98,5 +96,7 @@ function OptimalControlProblems.ducted_fan( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:ducted_fan, params, init) - return OptimalControlProblems.Problems._problem(:ducted_fan, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :ducted_fan, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlModels/electric_vehicle.jl b/ext/OptimalControlModels/electric_vehicle.jl index 0113cf115..852bc395f 100644 --- a/ext/OptimalControlModels/electric_vehicle.jl +++ b/ext/OptimalControlModels/electric_vehicle.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:electric_vehicle)` and `OptimalControlProblems.status(:electric_vehicle)`. """ function OptimalControlProblems.electric_vehicle( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:electric_vehicle, :OptimalControl) @@ -57,5 +55,7 @@ function OptimalControlProblems.electric_vehicle( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:electric_vehicle, params, init) - return OptimalControlProblems.Problems._problem(:electric_vehicle, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :electric_vehicle, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlModels/glider.jl b/ext/OptimalControlModels/glider.jl index 88b3299cc..71e465937 100644 --- a/ext/OptimalControlModels/glider.jl +++ b/ext/OptimalControlModels/glider.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:glider)` and `OptimalControlProblems.status(:glider)`. """ function OptimalControlProblems.glider( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:glider, :OptimalControl) @@ -93,5 +91,7 @@ function OptimalControlProblems.glider( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:glider, params, init) - return OptimalControlProblems.Problems._problem(:glider, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :glider, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlModels/insurance.jl b/ext/OptimalControlModels/insurance.jl index dafa3f6fc..23ba2423b 100644 --- a/ext/OptimalControlModels/insurance.jl +++ b/ext/OptimalControlModels/insurance.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:insurance)` and `OptimalControlProblems.status(:insurance)`. """ function OptimalControlProblems.insurance( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:insurance, :OptimalControl) @@ -96,5 +94,7 @@ function OptimalControlProblems.insurance( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:insurance, params, init) - return OptimalControlProblems.Problems._problem(:insurance, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :insurance, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlModels/jackson.jl b/ext/OptimalControlModels/jackson.jl index a85f35cb9..a845e25f4 100644 --- a/ext/OptimalControlModels/jackson.jl +++ b/ext/OptimalControlModels/jackson.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:jackson)` and `OptimalControlProblems.status(:jackson)`. """ function OptimalControlProblems.jackson( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:jackson, :OptimalControl) @@ -59,5 +57,7 @@ function OptimalControlProblems.jackson( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:jackson, params, init) - return OptimalControlProblems.Problems._problem(:jackson, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :jackson, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlModels/moonlander.jl b/ext/OptimalControlModels/moonlander.jl index fbcc9c473..827b7c9f4 100644 --- a/ext/OptimalControlModels/moonlander.jl +++ b/ext/OptimalControlModels/moonlander.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:moonlander)` and `OptimalControlProblems.status(:moonlander)`. """ function OptimalControlProblems.moonlander( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:moonlander, :OptimalControl) @@ -104,5 +102,7 @@ function OptimalControlProblems.moonlander( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:moonlander, params, init) - return OptimalControlProblems.Problems._problem(:moonlander, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :moonlander, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlModels/mountain_car.jl b/ext/OptimalControlModels/mountain_car.jl index 8f2ea9c7d..03c4e5dd3 100644 --- a/ext/OptimalControlModels/mountain_car.jl +++ b/ext/OptimalControlModels/mountain_car.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:mountain_car)` and `OptimalControlProblems.status(:mountain_car)`. """ function OptimalControlProblems.mountain_car( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:mountain_car, :OptimalControl) @@ -67,5 +65,7 @@ function OptimalControlProblems.mountain_car( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:mountain_car, params, init) - return OptimalControlProblems.Problems._problem(:mountain_car, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :mountain_car, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlModels/robbins.jl b/ext/OptimalControlModels/robbins.jl index ad08bc09a..25576feb9 100644 --- a/ext/OptimalControlModels/robbins.jl +++ b/ext/OptimalControlModels/robbins.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:robbins)` and `OptimalControlProblems.status(:robbins)`. """ function OptimalControlProblems.robbins( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:robbins, :OptimalControl) @@ -51,5 +49,7 @@ function OptimalControlProblems.robbins( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:robbins, params, init) - return OptimalControlProblems.Problems._problem(:robbins, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :robbins, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlModels/robot.jl b/ext/OptimalControlModels/robot.jl index 74521e15e..7ee89a9f8 100644 --- a/ext/OptimalControlModels/robot.jl +++ b/ext/OptimalControlModels/robot.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:robot)` and `OptimalControlProblems.status(:robot)`. """ function OptimalControlProblems.robot( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:robot, :OptimalControl) @@ -120,5 +118,7 @@ function OptimalControlProblems.robot( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:robot, params, init) - return OptimalControlProblems.Problems._problem(:robot, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :robot, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlModels/rocket.jl b/ext/OptimalControlModels/rocket.jl index a211153b8..86f8d8a6b 100644 --- a/ext/OptimalControlModels/rocket.jl +++ b/ext/OptimalControlModels/rocket.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:rocket)` and `OptimalControlProblems.status(:rocket)`. """ function OptimalControlProblems.rocket( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:rocket, :OptimalControl) @@ -80,5 +78,7 @@ function OptimalControlProblems.rocket( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:rocket, params, init) - return OptimalControlProblems.Problems._problem(:rocket, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :rocket, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlModels/space_shuttle.jl b/ext/OptimalControlModels/space_shuttle.jl index 431b48b1c..c09c32ff9 100644 --- a/ext/OptimalControlModels/space_shuttle.jl +++ b/ext/OptimalControlModels/space_shuttle.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:space_shuttle)` and `OptimalControlProblems.status(:space_shuttle)`. """ function OptimalControlProblems.space_shuttle( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:space_shuttle, :OptimalControl) @@ -158,5 +156,7 @@ function OptimalControlProblems.space_shuttle( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:space_shuttle, params, init) - return OptimalControlProblems.Problems._problem(:space_shuttle, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :space_shuttle, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlModels/steering.jl b/ext/OptimalControlModels/steering.jl index 6bc5e0c66..6c70dc8b6 100644 --- a/ext/OptimalControlModels/steering.jl +++ b/ext/OptimalControlModels/steering.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:steering)` and `OptimalControlProblems.status(:steering)`. """ function OptimalControlProblems.steering( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:steering, :OptimalControl) @@ -74,5 +72,7 @@ function OptimalControlProblems.steering( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:steering, params, init) - return OptimalControlProblems.Problems._problem(:steering, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :steering, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlModels/vanderpol.jl b/ext/OptimalControlModels/vanderpol.jl index 3104eb12e..fe8108a1a 100644 --- a/ext/OptimalControlModels/vanderpol.jl +++ b/ext/OptimalControlModels/vanderpol.jl @@ -11,9 +11,7 @@ Default parameters and the modeling status are available through `problem_metadata(:vanderpol)` and `OptimalControlProblems.status(:vanderpol)`. """ function OptimalControlProblems.vanderpol( - ::OptimalControlBackend; - parameters::Union{Nothing,NamedTuple}=nothing, - init=nothing, + ::OptimalControlBackend; parameters::Union{Nothing,NamedTuple}=nothing, init=nothing ) OptimalControlProblems.Catalogue._warn_if_draft(:vanderpol, :OptimalControl) @@ -42,5 +40,7 @@ function OptimalControlProblems.vanderpol( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:vanderpol, params, init) - return OptimalControlProblems.Problems._problem(:vanderpol, :OptimalControl, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :vanderpol, :OptimalControl, ocp, init, params + ) end diff --git a/ext/OptimalControlScalarizedModels/balanced_field.jl b/ext/OptimalControlScalarizedModels/balanced_field.jl index 0457f180b..9ce52f7df 100644 --- a/ext/OptimalControlScalarizedModels/balanced_field.jl +++ b/ext/OptimalControlScalarizedModels/balanced_field.jl @@ -15,7 +15,9 @@ function OptimalControlProblems.balanced_field( parameters::Union{Nothing,NamedTuple}=nothing, init=nothing, ) - OptimalControlProblems.Catalogue._warn_if_draft(:balanced_field, :OptimalControlScalarized) + OptimalControlProblems.Catalogue._warn_if_draft( + :balanced_field, :OptimalControlScalarized + ) # parameters params = parameters_data(:balanced_field, parameters) @@ -85,5 +87,7 @@ function OptimalControlProblems.balanced_field( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:balanced_field, params, init) - return OptimalControlProblems.Problems._problem(:balanced_field, :OptimalControlScalarized, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :balanced_field, :OptimalControlScalarized, ocp, init, params + ) end diff --git a/ext/OptimalControlScalarizedModels/beam.jl b/ext/OptimalControlScalarizedModels/beam.jl index 95db95c60..2b363f06a 100644 --- a/ext/OptimalControlScalarizedModels/beam.jl +++ b/ext/OptimalControlScalarizedModels/beam.jl @@ -47,5 +47,7 @@ function OptimalControlProblems.beam( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:beam, params, init) - return OptimalControlProblems.Problems._problem(:beam, :OptimalControlScalarized, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :beam, :OptimalControlScalarized, ocp, init, params + ) end diff --git a/ext/OptimalControlScalarizedModels/brachistochrone.jl b/ext/OptimalControlScalarizedModels/brachistochrone.jl index 82d9e27c0..f3798bb7e 100644 --- a/ext/OptimalControlScalarizedModels/brachistochrone.jl +++ b/ext/OptimalControlScalarizedModels/brachistochrone.jl @@ -15,7 +15,9 @@ function OptimalControlProblems.brachistochrone( parameters::Union{Nothing,NamedTuple}=nothing, init=nothing, ) - OptimalControlProblems.Catalogue._warn_if_draft(:brachistochrone, :OptimalControlScalarized) + OptimalControlProblems.Catalogue._warn_if_draft( + :brachistochrone, :OptimalControlScalarized + ) params = parameters_data(:brachistochrone, parameters) g = params[:g] t0 = params[:t0] @@ -53,5 +55,7 @@ function OptimalControlProblems.brachistochrone( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:brachistochrone, params, init) - return OptimalControlProblems.Problems._problem(:brachistochrone, :OptimalControlScalarized, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :brachistochrone, :OptimalControlScalarized, ocp, init, params + ) end diff --git a/ext/OptimalControlScalarizedModels/bryson_denham.jl b/ext/OptimalControlScalarizedModels/bryson_denham.jl index cfd24f557..a6503b228 100644 --- a/ext/OptimalControlScalarizedModels/bryson_denham.jl +++ b/ext/OptimalControlScalarizedModels/bryson_denham.jl @@ -16,7 +16,9 @@ function OptimalControlProblems.bryson_denham( parameters::Union{Nothing,NamedTuple}=nothing, init=nothing, ) - OptimalControlProblems.Catalogue._warn_if_draft(:bryson_denham, :OptimalControlScalarized) + OptimalControlProblems.Catalogue._warn_if_draft( + :bryson_denham, :OptimalControlScalarized + ) params = parameters_data(:bryson_denham, parameters) t0, tf = params[:t0], params[:tf] x1_t0, x2_t0 = params[:x1_t0], params[:x2_t0] @@ -42,5 +44,7 @@ function OptimalControlProblems.bryson_denham( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:bryson_denham, params, init) - return OptimalControlProblems.Problems._problem(:bryson_denham, :OptimalControlScalarized, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :bryson_denham, :OptimalControlScalarized, ocp, init, params + ) end diff --git a/ext/OptimalControlScalarizedModels/chain.jl b/ext/OptimalControlScalarizedModels/chain.jl index c66566fce..21ba649e1 100644 --- a/ext/OptimalControlScalarizedModels/chain.jl +++ b/ext/OptimalControlScalarizedModels/chain.jl @@ -57,5 +57,7 @@ function OptimalControlProblems.chain( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:chain, params, init) - return OptimalControlProblems.Problems._problem(:chain, :OptimalControlScalarized, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :chain, :OptimalControlScalarized, ocp, init, params + ) end diff --git a/ext/OptimalControlScalarizedModels/dielectrophoretic_particle.jl b/ext/OptimalControlScalarizedModels/dielectrophoretic_particle.jl index 1514f6426..c700c6c9a 100644 --- a/ext/OptimalControlScalarizedModels/dielectrophoretic_particle.jl +++ b/ext/OptimalControlScalarizedModels/dielectrophoretic_particle.jl @@ -50,7 +50,11 @@ function OptimalControlProblems.dielectrophoretic_particle( end # initial guess: from the metadata (#377), unless given - init = OptimalControlProblems.Metadata._initial_guess(:dielectrophoretic_particle, params, init) + init = OptimalControlProblems.Metadata._initial_guess( + :dielectrophoretic_particle, params, init + ) - return OptimalControlProblems.Problems._problem(:dielectrophoretic_particle, :OptimalControlScalarized, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :dielectrophoretic_particle, :OptimalControlScalarized, ocp, init, params + ) end diff --git a/ext/OptimalControlScalarizedModels/double_oscillator.jl b/ext/OptimalControlScalarizedModels/double_oscillator.jl index 330346af4..f8734b34c 100644 --- a/ext/OptimalControlScalarizedModels/double_oscillator.jl +++ b/ext/OptimalControlScalarizedModels/double_oscillator.jl @@ -15,7 +15,9 @@ function OptimalControlProblems.double_oscillator( parameters::Union{Nothing,NamedTuple}=nothing, init=nothing, ) - OptimalControlProblems.Catalogue._warn_if_draft(:double_oscillator, :OptimalControlScalarized) + OptimalControlProblems.Catalogue._warn_if_draft( + :double_oscillator, :OptimalControlScalarized + ) # parameters params = parameters_data(:double_oscillator, parameters) @@ -53,5 +55,7 @@ function OptimalControlProblems.double_oscillator( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:double_oscillator, params, init) - return OptimalControlProblems.Problems._problem(:double_oscillator, :OptimalControlScalarized, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :double_oscillator, :OptimalControlScalarized, ocp, init, params + ) end diff --git a/ext/OptimalControlScalarizedModels/ducted_fan.jl b/ext/OptimalControlScalarizedModels/ducted_fan.jl index db9778a7f..65d5d915b 100644 --- a/ext/OptimalControlScalarizedModels/ducted_fan.jl +++ b/ext/OptimalControlScalarizedModels/ducted_fan.jl @@ -92,5 +92,7 @@ function OptimalControlProblems.ducted_fan( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:ducted_fan, params, init) - return OptimalControlProblems.Problems._problem(:ducted_fan, :OptimalControlScalarized, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :ducted_fan, :OptimalControlScalarized, ocp, init, params + ) end diff --git a/ext/OptimalControlScalarizedModels/electric_vehicle.jl b/ext/OptimalControlScalarizedModels/electric_vehicle.jl index fdc622434..b1bbf6203 100644 --- a/ext/OptimalControlScalarizedModels/electric_vehicle.jl +++ b/ext/OptimalControlScalarizedModels/electric_vehicle.jl @@ -15,7 +15,9 @@ function OptimalControlProblems.electric_vehicle( parameters::Union{Nothing,NamedTuple}=nothing, init=nothing, ) - OptimalControlProblems.Catalogue._warn_if_draft(:electric_vehicle, :OptimalControlScalarized) + OptimalControlProblems.Catalogue._warn_if_draft( + :electric_vehicle, :OptimalControlScalarized + ) # parameters params = parameters_data(:electric_vehicle, parameters) @@ -56,5 +58,7 @@ function OptimalControlProblems.electric_vehicle( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:electric_vehicle, params, init) - return OptimalControlProblems.Problems._problem(:electric_vehicle, :OptimalControlScalarized, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :electric_vehicle, :OptimalControlScalarized, ocp, init, params + ) end diff --git a/ext/OptimalControlScalarizedModels/glider.jl b/ext/OptimalControlScalarizedModels/glider.jl index 9d0719bda..894df28aa 100644 --- a/ext/OptimalControlScalarizedModels/glider.jl +++ b/ext/OptimalControlScalarizedModels/glider.jl @@ -87,5 +87,7 @@ function OptimalControlProblems.glider( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:glider, params, init) - return OptimalControlProblems.Problems._problem(:glider, :OptimalControlScalarized, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :glider, :OptimalControlScalarized, ocp, init, params + ) end diff --git a/ext/OptimalControlScalarizedModels/insurance.jl b/ext/OptimalControlScalarizedModels/insurance.jl index f157fd3e4..4dfde9b72 100644 --- a/ext/OptimalControlScalarizedModels/insurance.jl +++ b/ext/OptimalControlScalarizedModels/insurance.jl @@ -98,5 +98,7 @@ function OptimalControlProblems.insurance( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:insurance, params, init) - return OptimalControlProblems.Problems._problem(:insurance, :OptimalControlScalarized, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :insurance, :OptimalControlScalarized, ocp, init, params + ) end diff --git a/ext/OptimalControlScalarizedModels/jackson.jl b/ext/OptimalControlScalarizedModels/jackson.jl index 1031db0f6..69a42da0d 100644 --- a/ext/OptimalControlScalarizedModels/jackson.jl +++ b/ext/OptimalControlScalarizedModels/jackson.jl @@ -57,5 +57,7 @@ function OptimalControlProblems.jackson( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:jackson, params, init) - return OptimalControlProblems.Problems._problem(:jackson, :OptimalControlScalarized, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :jackson, :OptimalControlScalarized, ocp, init, params + ) end diff --git a/ext/OptimalControlScalarizedModels/mountain_car.jl b/ext/OptimalControlScalarizedModels/mountain_car.jl index 419c769ad..715494da3 100644 --- a/ext/OptimalControlScalarizedModels/mountain_car.jl +++ b/ext/OptimalControlScalarizedModels/mountain_car.jl @@ -15,7 +15,9 @@ function OptimalControlProblems.mountain_car( parameters::Union{Nothing,NamedTuple}=nothing, init=nothing, ) - OptimalControlProblems.Catalogue._warn_if_draft(:mountain_car, :OptimalControlScalarized) + OptimalControlProblems.Catalogue._warn_if_draft( + :mountain_car, :OptimalControlScalarized + ) # parameters params = parameters_data(:mountain_car, parameters) @@ -68,5 +70,7 @@ function OptimalControlProblems.mountain_car( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:mountain_car, params, init) - return OptimalControlProblems.Problems._problem(:mountain_car, :OptimalControlScalarized, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :mountain_car, :OptimalControlScalarized, ocp, init, params + ) end diff --git a/ext/OptimalControlScalarizedModels/robbins.jl b/ext/OptimalControlScalarizedModels/robbins.jl index 32c13aa77..ba6e42dd4 100644 --- a/ext/OptimalControlScalarizedModels/robbins.jl +++ b/ext/OptimalControlScalarizedModels/robbins.jl @@ -53,5 +53,7 @@ function OptimalControlProblems.robbins( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:robbins, params, init) - return OptimalControlProblems.Problems._problem(:robbins, :OptimalControlScalarized, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :robbins, :OptimalControlScalarized, ocp, init, params + ) end diff --git a/ext/OptimalControlScalarizedModels/robot.jl b/ext/OptimalControlScalarizedModels/robot.jl index 5ff63e8e9..8111951e2 100644 --- a/ext/OptimalControlScalarizedModels/robot.jl +++ b/ext/OptimalControlScalarizedModels/robot.jl @@ -126,5 +126,7 @@ function OptimalControlProblems.robot( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:robot, params, init) - return OptimalControlProblems.Problems._problem(:robot, :OptimalControlScalarized, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :robot, :OptimalControlScalarized, ocp, init, params + ) end diff --git a/ext/OptimalControlScalarizedModels/rocket.jl b/ext/OptimalControlScalarizedModels/rocket.jl index 8420e23ec..9308454dc 100644 --- a/ext/OptimalControlScalarizedModels/rocket.jl +++ b/ext/OptimalControlScalarizedModels/rocket.jl @@ -77,5 +77,7 @@ function OptimalControlProblems.rocket( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:rocket, params, init) - return OptimalControlProblems.Problems._problem(:rocket, :OptimalControlScalarized, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :rocket, :OptimalControlScalarized, ocp, init, params + ) end diff --git a/ext/OptimalControlScalarizedModels/space_shuttle.jl b/ext/OptimalControlScalarizedModels/space_shuttle.jl index 1cbc97564..40d21a52d 100644 --- a/ext/OptimalControlScalarizedModels/space_shuttle.jl +++ b/ext/OptimalControlScalarizedModels/space_shuttle.jl @@ -15,7 +15,9 @@ function OptimalControlProblems.space_shuttle( parameters::Union{Nothing,NamedTuple}=nothing, init=nothing, ) - OptimalControlProblems.Catalogue._warn_if_draft(:space_shuttle, :OptimalControlScalarized) + OptimalControlProblems.Catalogue._warn_if_draft( + :space_shuttle, :OptimalControlScalarized + ) # Parameters params = parameters_data(:space_shuttle, parameters) @@ -147,5 +149,7 @@ function OptimalControlProblems.space_shuttle( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:space_shuttle, params, init) - return OptimalControlProblems.Problems._problem(:space_shuttle, :OptimalControlScalarized, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :space_shuttle, :OptimalControlScalarized, ocp, init, params + ) end diff --git a/ext/OptimalControlScalarizedModels/steering.jl b/ext/OptimalControlScalarizedModels/steering.jl index 2331e60f3..b604a3fe2 100644 --- a/ext/OptimalControlScalarizedModels/steering.jl +++ b/ext/OptimalControlScalarizedModels/steering.jl @@ -74,5 +74,7 @@ function OptimalControlProblems.steering( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:steering, params, init) - return OptimalControlProblems.Problems._problem(:steering, :OptimalControlScalarized, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :steering, :OptimalControlScalarized, ocp, init, params + ) end diff --git a/ext/OptimalControlScalarizedModels/vanderpol.jl b/ext/OptimalControlScalarizedModels/vanderpol.jl index 3a5821ce4..17581bd4b 100644 --- a/ext/OptimalControlScalarizedModels/vanderpol.jl +++ b/ext/OptimalControlScalarizedModels/vanderpol.jl @@ -43,5 +43,7 @@ function OptimalControlProblems.vanderpol( # initial guess: from the metadata (#377), unless given init = OptimalControlProblems.Metadata._initial_guess(:vanderpol, params, init) - return OptimalControlProblems.Problems._problem(:vanderpol, :OptimalControlScalarized, ocp, init, params) + return OptimalControlProblems.Problems._problem( + :vanderpol, :OptimalControlScalarized, ocp, init, params + ) end diff --git a/src/OptimalControlProblems.jl b/src/OptimalControlProblems.jl index 759ab9a9e..d96b1308d 100644 --- a/src/OptimalControlProblems.jl +++ b/src/OptimalControlProblems.jl @@ -24,10 +24,7 @@ using .Problems # (#413). The other public functions (`status`, `features`, `reference_objective`, …) are # called qualified, `OptimalControlProblems.status(problem)`. export JuMPBackend, - ModelingToolkitBackend, - OptimalControlBackend, - OptimalControlScalarizedBackend, - problems + ModelingToolkitBackend, OptimalControlBackend, OptimalControlScalarizedBackend, problems export time_grid, state, costate, control, variable, iterations, objective export control_components, control_dimension, diff --git a/test/common/comparison.jl b/test/common/comparison.jl index 0c0c7c449..256962f2a 100644 --- a/test/common/comparison.jl +++ b/test/common/comparison.jl @@ -4,7 +4,8 @@ # equivalence is the NLP equivalence of #284 (`common/equivalence.jl`), the components are # compared by `test_features`, and convergence is tested per modeling. isdefined(Main, :SolveJuMP) || include(joinpath(@__DIR__, "solve_jump.jl")) -isdefined(Main, :SolveOptimalControl) || include(joinpath(@__DIR__, "solve_optimalcontrol.jl")) +isdefined(Main, :SolveOptimalControl) || + include(joinpath(@__DIR__, "solve_optimalcontrol.jl")) module Comparison diff --git a/test/common/configs.jl b/test/common/configs.jl index 58f5273c3..6fa001b77 100644 --- a/test/common/configs.jl +++ b/test/common/configs.jl @@ -49,7 +49,9 @@ const CONFIGS = ( # MadNLP: `mu_init` (monotone barrier update) and `barrier=:loqo` (adaptive one), turned into # MadNLP's `barrier` option by `SolveOptimalControl.solver`. const ROBUSTNESS = ( - ipopt=((mu_strategy="monotone",), (mu_init=1e-3,), (mu_strategy="monotone", mu_init=1e-3)), + ipopt=( + (mu_strategy="monotone",), (mu_init=1e-3,), (mu_strategy="monotone", mu_init=1e-3) + ), madnlp=((mu_init=1e-3,), (mu_init=1e-5,), (barrier=:loqo,)), ) @@ -62,6 +64,8 @@ const GPU_CONFIGS = ( ) """Name of a configuration, for test sets and reports.""" -label(config) = join(("$k=$(v isa Tuple ? join(v, ",") : v)" for (k, v) in pairs(config)), " ") +function label(config) + return join(("$k=$(v isa Tuple ? join(v, ",") : v)" for (k, v) in pairs(config)), " ") +end end # module TestConfigs diff --git a/test/common/continuous.jl b/test/common/continuous.jl index 8a1648832..18f08387d 100644 --- a/test/common/continuous.jl +++ b/test/common/continuous.jl @@ -29,7 +29,9 @@ end """Trapezoidal rule of the values `y` of a function at the times `t`: the quadrature of both modelings, so that their objectives are compared on the same integral.""" function quadrature(t, y) - return sum((t[i + 1] - t[i]) * (y[i] + y[i + 1]) / 2 for i in 1:(length(t) - 1); init=0.0) + return sum( + (t[i + 1] - t[i]) * (y[i] + y[i + 1]) / 2 for i in 1:(length(t) - 1); init=0.0 + ) end guess(g, t) = g isa Function ? g(t) : g @@ -44,10 +46,12 @@ function trajectories(init, n, m, t0, tf) return map(AMPLITUDES) do a shift(k, i) = a * (1 + 0.1 * i + 0.3 * k) # positive, different at each node and component x = [vec1(haskey(init, :state) ? guess(init.state, s) : fill(0.5, n)) for s in t] - u = [vec1(haskey(init, :control) ? guess(init.control, s) : fill(0.5, m)) for s in t] + u = [ + vec1(haskey(init, :control) ? guess(init.control, s) : fill(0.5, m)) for s in t + ] x = [x[k] .+ shift.(k, 1:n) for k in eachindex(t)] u = [u[k] .+ shift.(k, 1:m) for k in eachindex(t)] - (; t, x, u) + return (; t, x, u) end end @@ -57,17 +61,17 @@ end # ----------------------------------------------------------------------------- function dynamics(ocp) f!, n = OC.dynamics(ocp), OC.state_dimension(ocp) - return (t, x, u, v) -> (r = zeros(n); f!(r, t, x, u, v); r) + return (t, x, u, v) -> (r=zeros(n); f!(r, t, x, u, v); r) end function path(ocp) lb, f!, ub, _ = OC.path_constraints_nl(ocp) - return lb, ub, (t, x, u, v) -> (r = zeros(length(lb)); f!(r, t, x, u, v); r) + return lb, ub, (t, x, u, v) -> (r=zeros(length(lb)); f!(r, t, x, u, v); r) end function boundary(ocp) lb, f!, ub, _ = OC.boundary_constraints_nl(ocp) - return lb, ub, (x0, xf, v) -> (r = zeros(length(lb)); f!(r, x0, xf, v); r) + return lb, ub, (x0, xf, v) -> (r=zeros(length(lb)); f!(r, x0, xf, v); r) end """Bounds `(lower, upper)` of each of the `dim` components, from the box constraints `box` of @@ -85,7 +89,8 @@ end vector) is not compared, which `compare` reports as a difference.""" function bounds(components) bound(b, default) = isnothing(b) ? default : b - return [bound(c.lower, -Inf) for c in components], [bound(c.upper, Inf) for c in components] + return [bound(c.lower, -Inf) for c in components], + [bound(c.upper, Inf) for c in components] end """ @@ -101,7 +106,9 @@ The checks of the JuMP `ProblemData` `data` against the OptimalControl model `oc problem, `init` being its initial guess: a `Dict` from the name of a check to whether it holds. """ function compare(data, ocp, init) - n, m, nv = OC.state_dimension(ocp), OC.control_dimension(ocp), OC.variable_dimension(ocp) + n, m, nv = OC.state_dimension(ocp), + OC.control_dimension(ocp), + OC.variable_dimension(ocp) v = haskey(init, :variable) ? vec1(init.variable) : ones(nv) ok = Dict{Symbol,Bool}() @@ -127,28 +134,45 @@ function compare(data, ocp, init) L = OC.has_lagrange_cost(ocp) ? OC.lagrange(ocp) : nothing g = OC.has_mayer_cost(ocp) ? OC.mayer(ocp) : nothing ok[:objective] = all(trajs) do tr - integrand_jump = isnothing(data.lagrange) ? 0.0 : quadrature(tr.t, [data.lagrange(tr.x[k], tr.u[k], v, tr.t[k]) for k in eachindex(tr.t)]) - integrand_oc = isnothing(L) ? 0.0 : quadrature(tr.t, [L(tr.t[k], tr.x[k], tr.u[k], v) for k in eachindex(tr.t)]) + integrand_jump = if isnothing(data.lagrange) + 0.0 + else + quadrature( + tr.t, [data.lagrange(tr.x[k], tr.u[k], v, tr.t[k]) for k in eachindex(tr.t)] + ) + end + integrand_oc = if isnothing(L) + 0.0 + else + quadrature(tr.t, [L(tr.t[k], tr.x[k], tr.u[k], v) for k in eachindex(tr.t)]) + end mayer = isnothing(g) ? 0.0 : g(tr.x[1], tr.x[end], v) - close_to( - [data.cost(integrand_jump, tr.x[1], tr.x[end], v)], [sign * (mayer + integrand_oc)] + return close_to( + [data.cost(integrand_jump, tr.x[1], tr.x[end], v)], + [sign * (mayer + integrand_oc)], ) end # path constraints, matched by their bounds and values lb, ub, c = path(ocp) - oc_keys = [key(lb[i], ub[i], [c(p.t, p.x, p.u, v)[i] for p in points]) for i in eachindex(lb)] + oc_keys = [ + key(lb[i], ub[i], [c(p.t, p.x, p.u, v)[i] for p in points]) for i in eachindex(lb) + ] jump_keys = [ - key(l, u, [first(vec1(h(p.x, p.u, v, p.t))) for p in points]) for (l, h, u) in data.path + key(l, u, [first(vec1(h(p.x, p.u, v, p.t))) for p in points]) for + (l, h, u) in data.path ] ok[:path] = sort(oc_keys) == sort(jump_keys) # boundary conditions, matched by their bounds and values at the ends of each trajectory lb, ub, c = boundary(ocp) ends = [(tr.x[1], tr.x[end]) for tr in trajs] - oc_keys = [key(lb[i], ub[i], [c(x0, xf, v)[i] for (x0, xf) in ends]) for i in eachindex(lb)] + oc_keys = [ + key(lb[i], ub[i], [c(x0, xf, v)[i] for (x0, xf) in ends]) for i in eachindex(lb) + ] jump_keys = [ - key(l, u, [first(vec1(h(x0, xf, v))) for (x0, xf) in ends]) for (l, h, u) in data.boundary + key(l, u, [first(vec1(h(x0, xf, v))) for (x0, xf) in ends]) for + (l, h, u) in data.boundary ] ok[:boundary] = sort(oc_keys) == sort(jump_keys) @@ -160,7 +184,9 @@ function compare(data, ocp, init) ) lower, upper = box(b, dim) jump_lower, jump_upper = bounds(components) - by_node = any(x -> x isa AbstractVector, jump_lower) || any(x -> x isa AbstractVector, jump_upper) + by_node = + any(x -> x isa AbstractVector, jump_lower) || + any(x -> x isa AbstractVector, jump_upper) ok[name] = !by_node && close_to(lower, jump_lower) && close_to(upper, jump_upper) end return ok diff --git a/test/common/continuous_modelingtoolkit.jl b/test/common/continuous_modelingtoolkit.jl index 6b2216961..c2109f2ff 100644 --- a/test/common/continuous_modelingtoolkit.jl +++ b/test/common/continuous_modelingtoolkit.jl @@ -104,7 +104,7 @@ function bounded(c) h, k = split_constant(l - r) return (-Inf, h, -k) end - throw(ArgumentError("unsupported constraint $c")) + return throw(ArgumentError("unsupported constraint $c")) end """Initial value of the state `x` when it is fixed (not tunable), `nothing` otherwise.""" @@ -124,7 +124,7 @@ function ordered(syms, names) return map(names) do n i = findfirst(s -> name(s) == n, syms) isnothing(i) && throw(ArgumentError("no component $n among $(name.(syms))")) - syms[i] + return syms[i] end end @@ -214,7 +214,8 @@ function problem_data(sys, state_names, control_names, tspan) times=v -> (t0, tf), dynamics=(x, u, v, t) -> [evaluate(f, sig, point(; t, x, u)) for f in rhs], lagrange=lagrange, - cost=(I, x0, xf, v) -> I + sum(evaluate(g, sig, point(; x0, xf)) for g in terms; init=0.0), + cost=(I, x0, xf, v) -> + I + sum(evaluate(g, sig, point(; x0, xf)) for g in terms; init=0.0), path=path, boundary=boundary, ) diff --git a/test/common/equivalence.jl b/test/common/equivalence.jl index d7193c8ed..629ef3d8c 100644 --- a/test/common/equivalence.jl +++ b/test/common/equivalence.jl @@ -99,7 +99,7 @@ not have, with whether they enter the matched part of `other`. """ function compare(reference, other, cols, xs, y) extra = setdiff(1:(other.meta.nvar), cols) - lift(x) = (z = fill(0.5, other.meta.nvar); z[cols] = x; z) + lift(x) = (z=fill(0.5, other.meta.nvar); z[cols]=x; z) rows = match_rows( signatures(reference, xs, 1:(reference.meta.nvar)), signatures(other, lift.(xs), cols), diff --git a/test/common/modeling_tests.jl b/test/common/modeling_tests.jl index c4fe5ad71..192d68d54 100644 --- a/test/common/modeling_tests.jl +++ b/test/common/modeling_tests.jl @@ -72,7 +72,8 @@ function test_problem(backend; model_type::Type, check=(problem, pb) -> nothing) # The initial guess is the one of the metadata (#377), unless another one is given. Test.@test OCP.initial_guess(pb) == OCP.initial_guess_data(problem) other = (state=OCP.initial_guess_data(problem).state, control=0) - Test.@test OCP.initial_guess(getfield(OCP, problem)(backend; init=other)) === other + Test.@test OCP.initial_guess(getfield(OCP, problem)(backend; init=other)) === + other # Shown with its name, modeling, status and dimensions. shown = sprint(show, MIME("text/plain"), pb) @@ -132,10 +133,16 @@ function test_convergence(backend, adapter) time = @elapsed sol = adapter.solve(pb, config; grid_size=N) # compiled # convergence is reported, not tested (#360); an exception still fails Main.TestStatus.result!( - test, problem, backend, Main.TestConfigs.label(config); + test, + problem, + backend, + Main.TestConfigs.label(config); adapter.settings(config)..., - grid_size=N, scheme=scheme, adapter.outcome(sol)..., - time=time, trajectory=adapter.trajectory(sol, pb), + grid_size=N, + scheme=scheme, + adapter.outcome(sol)..., + time=time, + trajectory=adapter.trajectory(sol, pb), reference=adapter.reference(problem, N, scheme), ) Test.@test true # the problem was solved and reported: a line of the report diff --git a/test/common/modelingtoolkit_tests.jl b/test/common/modelingtoolkit_tests.jl index ee0710167..31a6aaa37 100644 --- a/test/common/modelingtoolkit_tests.jl +++ b/test/common/modelingtoolkit_tests.jl @@ -47,8 +47,11 @@ function check(problem, pb) end """The API of a problem of the modeling: the `Problem`, its metadata, its display.""" -test_problem(backend) = - Main.ModelingTests.test_problem(backend; model_type=MTK.AbstractSystem, check=check) +function test_problem(backend) + return Main.ModelingTests.test_problem( + backend; model_type=MTK.AbstractSystem, check=check + ) +end """Every problem builds and runs a few iterations; the convergence is in the cron (#360).""" test_smoke(backend) = Main.ModelingTests.test_smoke(backend, adapter()) diff --git a/test/common/optimalcontrol_tests.jl b/test/common/optimalcontrol_tests.jl index c33a5168c..a2359084c 100644 --- a/test/common/optimalcontrol_tests.jl +++ b/test/common/optimalcontrol_tests.jl @@ -27,7 +27,9 @@ function adapter() end """The API of a problem of the modeling of `backend`: the `Problem`, its metadata, its display.""" -test_problem(backend) = Main.ModelingTests.test_problem(backend; model_type=OptimalControl.Model) +function test_problem(backend) + return Main.ModelingTests.test_problem(backend; model_type=OptimalControl.Model) +end """ Every problem builds, evaluates and runs a few iterations in each configuration; the diff --git a/test/common/selection.jl b/test/common/selection.jl index 47824ca69..038ef3c52 100644 --- a/test/common/selection.jl +++ b/test/common/selection.jl @@ -104,7 +104,9 @@ function directories( mode::Symbol, ) roots = Dict( - :suite => (suite,), :cron => (cron,), :convergence => (suite, cron), + :suite => (suite,), + :cron => (cron,), + :convergence => (suite, cron), :robustness => (robustness,), )[mode] return String[joinpath(r, group) for r in roots if isdir(joinpath(r, group))] diff --git a/test/common/solve_modelingtoolkit.jl b/test/common/solve_modelingtoolkit.jl index 04fb929e5..6d790fc01 100644 --- a/test/common/solve_modelingtoolkit.jl +++ b/test/common/solve_modelingtoolkit.jl @@ -28,8 +28,12 @@ function _sub_iv(expr, iv, τ) return τ elseif expr isa MTK.Symbolics.Equation return MTK.Symbolics.Equation(_sub_iv(expr.lhs, iv, τ), _sub_iv(expr.rhs, iv, τ)) - elseif hasproperty(expr, :relational_op) && hasproperty(expr, :lhs) && hasproperty(expr, :rhs) - return typeof(expr)(_sub_iv(expr.lhs, iv, τ), _sub_iv(expr.rhs, iv, τ), expr.relational_op) + elseif hasproperty(expr, :relational_op) && + hasproperty(expr, :lhs) && + hasproperty(expr, :rhs) + return typeof(expr)( + _sub_iv(expr.lhs, iv, τ), _sub_iv(expr.rhs, iv, τ), expr.relational_op + ) elseif MTK.SymbolicUtils.iscall(expr) op = MTK.SymbolicUtils.operation(expr) args = MTK.SymbolicUtils.arguments(expr) @@ -83,7 +87,7 @@ function _discretize_path_constraints(sys::MTK.AbstractSystem, grid::AbstractVec name=MTK.nameof(sys), constraints=new_cons, costs=MTK.get_costs(sys), - ) + ), ) end @@ -138,7 +142,7 @@ function prepare( shooting === :single || throw(ArgumentError("unsupported shooting method $shooting")) sys = OCP.model(pb) t0, tf = tspan(pb) - grid = range(t0, tf, length=grid_size) + grid = range(t0, tf; length=grid_size) # Discretize path constraints over the grid sys_disc = _discretize_path_constraints(sys, grid) @@ -150,11 +154,7 @@ function prepare( switches = [u => collect(grid[1:(end - 1)]) for u in ctrl_syms] dynamic = Corleone.CorleoneDynamicOptProblem( - sys_disc, - inits, - switches...; - algorithm=Tsit5(), - tspan=(t0, tf), + sys_disc, inits, switches...; algorithm=Tsit5(), tspan=(t0, tf) ) problem = Optimization.OptimizationProblem(dynamic, Optimization.AutoForwardDiff()) return (; problem, dynamic) diff --git a/test/common/solve_optimalcontrol.jl b/test/common/solve_optimalcontrol.jl index 8ce8be9a7..7706968bf 100644 --- a/test/common/solve_optimalcontrol.jl +++ b/test/common/solve_optimalcontrol.jl @@ -65,7 +65,11 @@ end """Solve the `Problem` `pb` with `config`; the default grid of the problem if `grid_size` is `nothing`.""" function solve( - pb, config; grid_size::Int, max_iter::Int=Main.TestConfigs.MAX_ITER, options::NamedTuple=(;) + pb, + config; + grid_size::Int, + max_iter::Int=Main.TestConfigs.MAX_ITER, + options::NamedTuple=(;), ) return OptimalControl.solve( OptimalControlProblems.model(pb); diff --git a/test/common/status.jl b/test/common/status.jl index e0265e3c9..17d60ea97 100644 --- a/test/common/status.jl +++ b/test/common/status.jl @@ -133,8 +133,9 @@ end const RESULTS = Result[] """Relative gap of `objective` to `reference` (absolute when the reference is zero).""" -gap(objective, reference) = - abs(objective - reference) / (iszero(reference) ? 1 : abs(reference)) +function gap(objective, reference) + return abs(objective - reference) / (iszero(reference) ? 1 : abs(reference)) +end """ result!(test, problem, backend, configuration; modeler, solver, options, grid_size, @@ -242,7 +243,7 @@ function _trajectory(x) return Dict(name => [r(f(τ)[i]) for τ in t] for (i, name) in enumerate(names)) end xs, us = O.state_components(x), O.control_components(x) - scalar(f) = τ -> (y = f(τ); y isa Number ? [y] : y) + scalar(f) = τ -> (y=f(τ); y isa Number ? [y] : y) return Dict{String,Any}( "time" => r.(t), "state" => components(scalar(O.state(x)), xs), @@ -426,7 +427,9 @@ function results_table(tsv::AbstractString) end open(tsv, "w") do io println(io, join([header; extra], "\t")) - foreach(r -> println(io, join([cells(r, full); extra_cells(r)], "\t")), RESULTS) + return foreach( + r -> println(io, join([cells(r, full); extra_cells(r)], "\t")), RESULTS + ) end lines = [ "", diff --git a/test/cron/JuMP/test_convergence.jl b/test/cron/JuMP/test_convergence.jl index 95bfcbb45..8b55b5a23 100644 --- a/test/cron/JuMP/test_convergence.jl +++ b/test/cron/JuMP/test_convergence.jl @@ -1,4 +1,5 @@ -isdefined(Main, :SolveJuMP) || include(joinpath(@__DIR__, "..", "..", "common", "solve_jump.jl")) +isdefined(Main, :SolveJuMP) || + include(joinpath(@__DIR__, "..", "..", "common", "solve_jump.jl")) module TestConvergenceJuMP @@ -10,23 +11,30 @@ const VERBOSE = isdefined(Main, :TestOptions) ? Main.TestOptions.VERBOSE : true const SHOWTIMING = isdefined(Main, :TestOptions) ? Main.TestOptions.SHOWTIMING : true function test_convergence() - Test.@testset "JuMP convergence report (default grid)" verbose = VERBOSE showtiming = SHOWTIMING begin + Test.@testset "JuMP convergence report (default grid)" verbose = VERBOSE showtiming = + SHOWTIMING begin for config in Main.TestConfigs.CONFIGS.JuMP Test.@testset "$(Main.TestConfigs.label(config))" begin test = "test_convergence $(Main.TestConfigs.label(config))" - Main.TestStatus.for_each_problem(test, OptimalControlProblems.JuMPBackend()) do problem + Main.TestStatus.for_each_problem( + test, OptimalControlProblems.JuMPBackend() + ) do problem build = getfield(OptimalControlProblems, problem) model = build(OptimalControlProblems.JuMPBackend()) Main.SolveJuMP.solve!(model; solver=config.solver) time = @elapsed Main.SolveJuMP.solve!(model; solver=config.solver) # warm # convergence is reported, not tested (#360); an exception still fails Main.TestStatus.result!( - test, problem, OptimalControlProblems.JuMPBackend(), + test, + problem, + OptimalControlProblems.JuMPBackend(), Main.TestConfigs.label(config); Main.SolveJuMP.settings(config)..., grid_size=OptimalControlProblems.grid_size_data(problem), - scheme=Main.TestConfigs.SCHEME, Main.SolveJuMP.outcome(model)..., - time=time, trajectory=Main.TestStatus.trajectory(model), + scheme=Main.TestConfigs.SCHEME, + Main.SolveJuMP.outcome(model)..., + time=time, + trajectory=Main.TestStatus.trajectory(model), ) Test.@test true end diff --git a/test/cron/ModelingToolkit/test_convergence.jl b/test/cron/ModelingToolkit/test_convergence.jl index e7a1601f6..6ee889c45 100644 --- a/test/cron/ModelingToolkit/test_convergence.jl +++ b/test/cron/ModelingToolkit/test_convergence.jl @@ -7,9 +7,11 @@ using OptimalControlProblems: OptimalControlProblems # The convergence report on the default grid; written once in `common/modeling_tests.jl` # (#441, #439). The gap is to the objective of the analytic solution, when there is one. -test_convergence() = Main.ModelingToolkitTests.test_convergence( - OptimalControlProblems.ModelingToolkitBackend() -) +function test_convergence() + return Main.ModelingToolkitTests.test_convergence( + OptimalControlProblems.ModelingToolkitBackend() + ) +end end # module TestConvergenceModelingToolkit diff --git a/test/cron/OptimalControl/test_convergence.jl b/test/cron/OptimalControl/test_convergence.jl index c6f187552..cea7d4fc6 100644 --- a/test/cron/OptimalControl/test_convergence.jl +++ b/test/cron/OptimalControl/test_convergence.jl @@ -7,9 +7,11 @@ using OptimalControlProblems: OptimalControlProblems # The convergence report on the default grid; written once in `common/optimalcontrol_tests.jl` # (#441). -test_convergence() = Main.OptimalControlTests.test_convergence( - OptimalControlProblems.OptimalControlBackend() -) +function test_convergence() + return Main.OptimalControlTests.test_convergence( + OptimalControlProblems.OptimalControlBackend() + ) +end end # module TestConvergenceOptimalControl diff --git a/test/cron/OptimalControlScalarized/test_convergence.jl b/test/cron/OptimalControlScalarized/test_convergence.jl index 4e8b2f441..e8b50f24b 100644 --- a/test/cron/OptimalControlScalarized/test_convergence.jl +++ b/test/cron/OptimalControlScalarized/test_convergence.jl @@ -7,9 +7,11 @@ using OptimalControlProblems: OptimalControlProblems # The convergence report on the default grid; written once in `common/optimalcontrol_tests.jl` # (#441). -test_convergence() = Main.OptimalControlTests.test_convergence( - OptimalControlProblems.OptimalControlScalarizedBackend() -) +function test_convergence() + return Main.OptimalControlTests.test_convergence( + OptimalControlProblems.OptimalControlScalarizedBackend() + ) +end end # module TestConvergenceOptimalControlScalarized diff --git a/test/robustness/JuMP/test_robustness.jl b/test/robustness/JuMP/test_robustness.jl index ab4d4d956..7d7085d3b 100644 --- a/test/robustness/JuMP/test_robustness.jl +++ b/test/robustness/JuMP/test_robustness.jl @@ -1,4 +1,5 @@ -isdefined(Main, :SolveJuMP) || include(joinpath(@__DIR__, "..", "..", "common", "solve_jump.jl")) +isdefined(Main, :SolveJuMP) || + include(joinpath(@__DIR__, "..", "..", "common", "solve_jump.jl")) module TestRobustnessJuMP @@ -15,19 +16,27 @@ const SHOWTIMING = isdefined(Main, :TestOptions) ? Main.TestOptions.SHOWTIMING : function test_robustness() C = Main.TestConfigs backend = OptimalControlProblems.JuMPBackend() - Test.@testset "JuMP robustness report (default grid)" verbose = VERBOSE showtiming = SHOWTIMING begin + Test.@testset "JuMP robustness report (default grid)" verbose = VERBOSE showtiming = + SHOWTIMING begin for config in C.CONFIGS.JuMP, options in getfield(C.ROBUSTNESS, config.solver) label = C.label(merge(config, options)) Test.@testset "$label" begin test = "test_robustness $label" Main.TestStatus.for_each_problem(test, backend) do problem model = getfield(OptimalControlProblems, problem)(backend) - time = @elapsed Main.SolveJuMP.solve!(model; solver=config.solver, options=options) + time = @elapsed Main.SolveJuMP.solve!( + model; solver=config.solver, options=options + ) Main.TestStatus.result!( - test, problem, backend, label; + test, + problem, + backend, + label; Main.SolveJuMP.settings(config; options=options)..., grid_size=OptimalControlProblems.grid_size_data(problem), - scheme=C.SCHEME, Main.SolveJuMP.outcome(model)..., time=time, + scheme=C.SCHEME, + Main.SolveJuMP.outcome(model)..., + time=time, ) Test.@test true end diff --git a/test/robustness/OptimalControl/test_robustness.jl b/test/robustness/OptimalControl/test_robustness.jl index 22ac430a2..28903d55f 100644 --- a/test/robustness/OptimalControl/test_robustness.jl +++ b/test/robustness/OptimalControl/test_robustness.jl @@ -19,7 +19,9 @@ function test_robustness() backend = OptimalControlProblems.OptimalControlBackend() Test.@testset "OptimalControl robustness report (default grid)" verbose = VERBOSE showtiming = SHOWTIMING begin - for config in C.CONFIGS.OptimalControl, options in getfield(C.ROBUSTNESS, config.solver) + for config in C.CONFIGS.OptimalControl, + options in getfield(C.ROBUSTNESS, config.solver) + label = C.label(merge(config, options)) Test.@testset "$label" begin test = "test_robustness $label" @@ -29,9 +31,15 @@ function test_robustness() sol = nothing time = @elapsed sol = S.solve(pb, config; grid_size=N, options=options) Main.TestStatus.result!( - test, problem, backend, label; + test, + problem, + backend, + label; S.settings(config; options=options)..., - grid_size=N, scheme=C.SCHEME, S.outcome(sol)..., time=time, + grid_size=N, + scheme=C.SCHEME, + S.outcome(sol)..., + time=time, ) Test.@test true end diff --git a/test/runtests.jl b/test/runtests.jl index 1ea0b7717..e87db973e 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -69,11 +69,14 @@ GitHub Actions (see below). The code coverage flag of this process is forwarded (`Base.julia_cmd`). Returns `true` on success. """ function run_environment( - name::AbstractString; dirs::Vector{String}, report::AbstractString, patterns::Vector{String} + name::AbstractString; + dirs::Vector{String}, + report::AbstractString, + patterns::Vector{String}, ) # In GitHub Actions the project is kept (see `finally`), also past the exit of Julia. keep = get(ENV, "GITHUB_ACTIONS", "false") == "true" - project = mktempdir(; cleanup=!keep) + project = mktempdir(; cleanup=(!keep)) cp(joinpath(SUITE, name, "Project.toml"), joinpath(project, "Project.toml")) # `Pkg.test` restricts JULIA_LOAD_PATH (and may set JULIA_PROJECT) to its own # temporary environment: a subprocess inheriting them would ignore `--project`. @@ -87,7 +90,9 @@ function run_environment( problem_args = isempty(problem_names) ? String[] : ["problem=" * join(problem_names, ",")] tests = join(dirs, "|") - run(`$julia --project=$project $script $tests $name $report $problem_args $patterns`) + run( + `$julia --project=$project $script $tests $name $report $problem_args $patterns` + ) return true catch err @error "Environment $name failed" exception = err @@ -113,7 +118,9 @@ filter!(name -> !isempty(dirs(name)), selected) Test.@testset "OptimalControlProblems tests" verbose = Main.TestOptions.VERBOSE showtiming = Main.TestOptions.SHOWTIMING begin - println("Environments: ", join([CORE; selected], ", "), mode === :suite ? "" : " ($mode)") + println( + "Environments: ", join([CORE; selected], ", "), mode === :suite ? "" : " ($mode)" + ) # `core` has no cron tests: in cron mode it has no directory and nothing runs. try @@ -127,7 +134,9 @@ Test.@testset "OptimalControlProblems tests" verbose = Main.TestOptions.VERBOSE for name in selected Test.@testset "environment $name" begin report = mode in (:cron, :robustness) ? "$name-$mode" : name - Test.@test run_environment(name; dirs=dirs(name), report=report, patterns=patterns) + Test.@test run_environment( + name; dirs=dirs(name), report=report, patterns=patterns + ) end end end diff --git a/test/suite/GPU/test_smoke_optimalcontrol.jl b/test/suite/GPU/test_smoke_optimalcontrol.jl index 41fea12cc..0739501c6 100644 --- a/test/suite/GPU/test_smoke_optimalcontrol.jl +++ b/test/suite/GPU/test_smoke_optimalcontrol.jl @@ -19,7 +19,8 @@ const SHOWTIMING = isdefined(Main, :TestOptions) ? Main.TestOptions.SHOWTIMING : function test_smoke_optimalcontrol() S = Main.SolveOptimalControl backend = OptimalControlProblems.OptimalControlBackend() - Test.@testset "OptimalControl smoke on GPU (small grid, few iterations)" verbose = VERBOSE showtiming = SHOWTIMING begin + Test.@testset "OptimalControl smoke on GPU (small grid, few iterations)" verbose = + VERBOSE showtiming = SHOWTIMING begin for config in Main.TestConfigs.GPU_CONFIGS.OptimalControl Test.@testset "$(Main.TestConfigs.label(config))" begin test = "test_smoke_optimalcontrol $(Main.TestConfigs.label(config))" @@ -29,13 +30,20 @@ function test_smoke_optimalcontrol() if Main.TestCapabilities.CUDA_FUNCTIONAL # a few iterations: the solve runs on the device and gives a finite # objective; whether it converges is not checked (#360) - sol = S.solve(pb, config; grid_size=o.SMOKE_GRID, max_iter=o.SMOKE_MAX_ITER) + sol = S.solve( + pb, config; grid_size=o.SMOKE_GRID, max_iter=o.SMOKE_MAX_ITER + ) Test.@test isfinite(OptimalControl.objective(sol)) else # no device: a visible skip (TST6), not a vacuous pass Test.@test_skip isfinite( OptimalControl.objective( - S.solve(pb, config; grid_size=o.SMOKE_GRID, max_iter=o.SMOKE_MAX_ITER) + S.solve( + pb, + config; + grid_size=o.SMOKE_GRID, + max_iter=o.SMOKE_MAX_ITER, + ), ), ) end diff --git a/test/suite/GPU/test_smoke_scalarized.jl b/test/suite/GPU/test_smoke_scalarized.jl index a1b0dd86b..fe65136bc 100644 --- a/test/suite/GPU/test_smoke_scalarized.jl +++ b/test/suite/GPU/test_smoke_scalarized.jl @@ -19,7 +19,8 @@ const SHOWTIMING = isdefined(Main, :TestOptions) ? Main.TestOptions.SHOWTIMING : function test_smoke_scalarized() S = Main.SolveOptimalControl backend = OptimalControlProblems.OptimalControlScalarizedBackend() - Test.@testset "OptimalControlScalarized smoke on GPU (small grid, few iterations)" verbose = VERBOSE showtiming = SHOWTIMING begin + Test.@testset "OptimalControlScalarized smoke on GPU (small grid, few iterations)" verbose = + VERBOSE showtiming = SHOWTIMING begin for config in Main.TestConfigs.GPU_CONFIGS.OptimalControlScalarized Test.@testset "$(Main.TestConfigs.label(config))" begin test = "test_smoke_scalarized $(Main.TestConfigs.label(config))" @@ -29,13 +30,20 @@ function test_smoke_scalarized() if Main.TestCapabilities.CUDA_FUNCTIONAL # a few iterations: the solve runs on the device and gives a finite # objective; whether it converges is not checked (#360) - sol = S.solve(pb, config; grid_size=o.SMOKE_GRID, max_iter=o.SMOKE_MAX_ITER) + sol = S.solve( + pb, config; grid_size=o.SMOKE_GRID, max_iter=o.SMOKE_MAX_ITER + ) Test.@test isfinite(OptimalControl.objective(sol)) else # no device: a visible skip (TST6), not a vacuous pass Test.@test_skip isfinite( OptimalControl.objective( - S.solve(pb, config; grid_size=o.SMOKE_GRID, max_iter=o.SMOKE_MAX_ITER) + S.solve( + pb, + config; + grid_size=o.SMOKE_GRID, + max_iter=o.SMOKE_MAX_ITER, + ), ), ) end diff --git a/test/suite/JuMP/test_build.jl b/test/suite/JuMP/test_build.jl index e4e45a103..f7eb4b12d 100644 --- a/test/suite/JuMP/test_build.jl +++ b/test/suite/JuMP/test_build.jl @@ -375,7 +375,10 @@ function test_start() # a scalar is the guess of a one-dimensional component model = EXT.build( - FAKE, N, scheme, :interleaved; + FAKE, + N, + scheme, + :interleaved; init=(state=0.5, control=-0.5, variable=1.6), ) Test.@test start_of(model, "x") == fill(0.5, N + 1) @@ -383,9 +386,7 @@ function test_start() Test.@test JuMP.start_value(model[:T]) == 1.6 # a key that is missing leaves its variables unset - model = EXT.build( - VECTOR, N, scheme, :interleaved; init=(state=[1.0, 2.0],) - ) + model = EXT.build(VECTOR, N, scheme, :interleaved; init=(state=[1.0, 2.0],)) Test.@test all(isnothing, start_of(model, "u₁")) Test.@test isnothing(JuMP.start_value(model[:T])) Test.@test start_of(model, "x₁") == fill(1.0, N + 1) diff --git a/test/suite/JuMP/test_contract.jl b/test/suite/JuMP/test_contract.jl index 90c7be2f6..5a19038a7 100644 --- a/test/suite/JuMP/test_contract.jl +++ b/test/suite/JuMP/test_contract.jl @@ -29,13 +29,20 @@ function test_contract() # the default model: components, initial guess of the metadata (#377), time grid model = build(OCP.JuMPBackend(); grid_size=2) - names = [model[:state_components]; model[:control_components]; model[:variable_components]] + names = [ + model[:state_components]; + model[:control_components]; + model[:variable_components] + ] Test.@test !isempty(model[:state_components]) Test.@test !isempty(model[:control_components]) Test.@test allunique(names) - Test.@test length(model[:costate_components]) == length(model[:state_components]) - Test.@test all(x -> JuMP.start_value(x) isa Real && isfinite(JuMP.start_value(x)), - JuMP.all_variables(model)) + Test.@test length(model[:costate_components]) == + length(model[:state_components]) + Test.@test all( + x -> JuMP.start_value(x) isa Real && isfinite(JuMP.start_value(x)), + JuMP.all_variables(model), + ) # the initial time grid, read at the start values: no solve, even for a free time T = collect(model[:time_grid](JuMP.start_value)) Test.@test length(T) == 3 @@ -49,7 +56,13 @@ function test_contract() other = merge(guess, (state=double(guess.state), control=double(guess.control))) options = (grid_size=3, scheme=:midpoint, ordering=:blocks) base = build(OCP.JuMPBackend(); options...) - changed = build(OCP.JuMPBackend(), Ipopt.Optimizer; options..., init=other, add_bridges=false) + changed = build( + OCP.JuMPBackend(), + Ipopt.Optimizer; + options..., + init=other, + add_bridges=false, + ) Test.@test changed[:scheme] === :midpoint Test.@test changed[:ordering] === :blocks Test.@test nodes(changed) == 4 @@ -59,7 +72,8 @@ function test_contract() reference, doubled = starts(base), starts(changed) Test.@test keys(doubled) == keys(reference) Test.@test all( - doubled[name] ≈ (name in fixed ? 1 : 2) * reference[name] for name in keys(reference) + doubled[name] ≈ (name in fixed ? 1 : 2) * reference[name] for + name in keys(reference) ) end end diff --git a/test/suite/JuMP/test_draft.jl b/test/suite/JuMP/test_draft.jl index 4fb225fcc..31373393b 100644 --- a/test/suite/JuMP/test_draft.jl +++ b/test/suite/JuMP/test_draft.jl @@ -9,7 +9,9 @@ const SHOWTIMING = isdefined(Main, :TestOptions) ? Main.TestOptions.SHOWTIMING : function test_draft() Test.@testset "JuMP draft warning" verbose = VERBOSE showtiming = SHOWTIMING begin - problem = first(OptimalControlProblems.problems(OptimalControlProblems.JuMPBackend())) + problem = first( + OptimalControlProblems.problems(OptimalControlProblems.JuMPBackend()) + ) build = getfield(OptimalControlProblems, problem) data = OptimalControlProblems.problem_metadata(problem) original = data[:status] diff --git a/test/suite/JuMP/test_methods.jl b/test/suite/JuMP/test_methods.jl index 28f8af1b5..4c4c3e318 100644 --- a/test/suite/JuMP/test_methods.jl +++ b/test/suite/JuMP/test_methods.jl @@ -1,4 +1,5 @@ -isdefined(Main, :TestMethods) || include(joinpath(@__DIR__, "..", "..", "common", "methods.jl")) +isdefined(Main, :TestMethods) || + include(joinpath(@__DIR__, "..", "..", "common", "methods.jl")) module TestMethodsJuMP diff --git a/test/suite/JuMP/test_signs.jl b/test/suite/JuMP/test_signs.jl index 63c9f9d56..3103e1f4e 100644 --- a/test/suite/JuMP/test_signs.jl +++ b/test/suite/JuMP/test_signs.jl @@ -1,4 +1,5 @@ -isdefined(Main, :SolveJuMP) || include(joinpath(@__DIR__, "..", "..", "common", "solve_jump.jl")) +isdefined(Main, :SolveJuMP) || + include(joinpath(@__DIR__, "..", "..", "common", "solve_jump.jl")) module TestSignsJuMP @@ -42,7 +43,11 @@ function nlp_equality(; negated::Bool, sense::JuMP.MOI.OptimizationSense) model = JuMP.Model() JuMP.@variable(model, x) JuMP.@variable(model, y) - ref = negated ? JuMP.@constraint(model, -x - y == -2) : JuMP.@constraint(model, x + y == 2) + ref = if negated + JuMP.@constraint(model, -x - y == -2) + else + JuMP.@constraint(model, x + y == 2) + end f = x^2 + y^2 JuMP.@objective(model, sense, sense === JuMP.MOI.MIN_SENSE ? f : -f) return model, ref @@ -102,7 +107,9 @@ function test_rows() Main.SolveJuMP.solve!(model) Test.@test JuMP.dual(ref) ≈ -6 atol = ATOL Test.@test EXT._multiplier(ref) ≈ 6 atol = ATOL - model, ref = nlp((m, x) -> JuMP.@constraint(m, -2 <= x <= 0), -5, JuMP.MOI.MIN_SENSE) + model, ref = nlp( + (m, x) -> JuMP.@constraint(m, -2 <= x <= 0), -5, JuMP.MOI.MIN_SENSE + ) Main.SolveJuMP.solve!(model) Test.@test JuMP.dual(ref) ≈ 6 atol = ATOL Test.@test EXT._multiplier(ref) ≈ -6 atol = ATOL @@ -156,8 +163,8 @@ function test_ocp() T = collect(Float64, OCP.time_grid(model)) τ = (T[1:(end - 1)] .+ T[2:end]) ./ 2 p2(t) = p(t)[2] - Test.@test [p2(τ[i]) + p2(τ[i + 1]) for i in 1:(N - 1)] ≈ - [4 * u(T[i + 1]) for i in 1:(N - 1)] atol = 1e-3 + Test.@test [p2(τ[i]) + p2(τ[i + 1]) for i in 1:(N - 1)] ≈ [4 * u(T[i + 1]) for i in 1:(N - 1)] atol = + 1e-3 # Boundary contract: flat extrapolation outside [τ_1, τ_N] Test.@test EXT._costate_times(T) == τ diff --git a/test/suite/JuMP/test_smoke.jl b/test/suite/JuMP/test_smoke.jl index 9df8eafdf..1580231f6 100644 --- a/test/suite/JuMP/test_smoke.jl +++ b/test/suite/JuMP/test_smoke.jl @@ -1,4 +1,5 @@ -isdefined(Main, :SolveJuMP) || include(joinpath(@__DIR__, "..", "..", "common", "solve_jump.jl")) +isdefined(Main, :SolveJuMP) || + include(joinpath(@__DIR__, "..", "..", "common", "solve_jump.jl")) module TestSmokeJuMP @@ -12,16 +13,24 @@ const SHOWTIMING = isdefined(Main, :TestOptions) ? Main.TestOptions.SHOWTIMING : # Every problem builds, evaluates and runs a few iterations; the convergence is reported by # the convergence tests (`convergence` argument, cron), #360. function test_smoke() - Test.@testset "JuMP smoke (small grid, few iterations)" verbose = VERBOSE showtiming = SHOWTIMING begin + Test.@testset "JuMP smoke (small grid, few iterations)" verbose = VERBOSE showtiming = + SHOWTIMING begin for config in Main.TestConfigs.CONFIGS.JuMP Test.@testset "$(Main.TestConfigs.label(config))" begin test = "test_smoke $(Main.TestConfigs.label(config))" - Main.TestStatus.for_each_problem(test, OptimalControlProblems.JuMPBackend()) do problem + Main.TestStatus.for_each_problem( + test, OptimalControlProblems.JuMPBackend() + ) do problem build = getfield(OptimalControlProblems, problem) o = Main.TestConfigs - model = build(OptimalControlProblems.JuMPBackend(); grid_size=o.SMOKE_GRID) - Main.SolveJuMP.solve!(model; solver=config.solver, max_iter=o.SMOKE_MAX_ITER) - Test.@test JuMP.has_values(model) && isfinite(JuMP.objective_value(model)) + model = build( + OptimalControlProblems.JuMPBackend(); grid_size=o.SMOKE_GRID + ) + Main.SolveJuMP.solve!( + model; solver=config.solver, max_iter=o.SMOKE_MAX_ITER + ) + Test.@test JuMP.has_values(model) && + isfinite(JuMP.objective_value(model)) end end end diff --git a/test/suite/JuMP/test_tableaux.jl b/test/suite/JuMP/test_tableaux.jl index 7632c2ed4..1f456e03e 100644 --- a/test/suite/JuMP/test_tableaux.jl +++ b/test/suite/JuMP/test_tableaux.jl @@ -50,7 +50,7 @@ function test_tableaux() Test.@testset "a stage inside the step needs stage unknowns" begin # Hermite–Simpson (Lobatto IIIA, 3 stages): the middle stage is not a node - A = [0 0 0; 5/24 1/3 -1/24; 1/6 2/3 1/6] + A = [0 0 0; 5 / 24 1 / 3 -1 / 24; 1 / 6 2 / 3 1 / 6] tab = ext.ButcherTableau(:lobatto_iiia_3, A, [1 / 6, 2 / 3, 1 / 6], [0, 0.5, 1]) Test.@test ext.is_fsal(tab) Test.@test_throws CTBase.Exceptions.NotImplemented ext.stage_positions(tab) diff --git a/test/suite/ModelingToolkit/test_problem.jl b/test/suite/ModelingToolkit/test_problem.jl index 80cf12757..c751c530d 100644 --- a/test/suite/ModelingToolkit/test_problem.jl +++ b/test/suite/ModelingToolkit/test_problem.jl @@ -6,7 +6,11 @@ module TestProblemModelingToolkit using OptimalControlProblems: OptimalControlProblems # Written once in `common/modeling_tests.jl` (#441, #439). -test_problem() = Main.ModelingToolkitTests.test_problem(OptimalControlProblems.ModelingToolkitBackend()) +function test_problem() + return Main.ModelingToolkitTests.test_problem( + OptimalControlProblems.ModelingToolkitBackend() + ) +end end # module TestProblemModelingToolkit diff --git a/test/suite/ModelingToolkit/test_smoke.jl b/test/suite/ModelingToolkit/test_smoke.jl index 1205ffa55..82f35e922 100644 --- a/test/suite/ModelingToolkit/test_smoke.jl +++ b/test/suite/ModelingToolkit/test_smoke.jl @@ -6,7 +6,11 @@ module TestSmokeModelingToolkit using OptimalControlProblems: OptimalControlProblems # Written once in `common/modeling_tests.jl` (#441, #439). -test_smoke() = Main.ModelingToolkitTests.test_smoke(OptimalControlProblems.ModelingToolkitBackend()) +function test_smoke() + return Main.ModelingToolkitTests.test_smoke( + OptimalControlProblems.ModelingToolkitBackend() + ) +end end # module TestSmokeModelingToolkit diff --git a/test/suite/OptimalControl/test_features.jl b/test/suite/OptimalControl/test_features.jl index 0d0a0b565..0d7f148e5 100644 --- a/test/suite/OptimalControl/test_features.jl +++ b/test/suite/OptimalControl/test_features.jl @@ -23,11 +23,14 @@ function test_features() Test.@test f.variable_dimension == OptimalControl.variable_dimension(ocp) Test.@test f.cost in (:mayer, :lagrange, :bolza) Test.@test (f.cost in (:mayer, :bolza)) == OptimalControl.has_mayer_cost(ocp) - Test.@test (f.cost in (:lagrange, :bolza)) == OptimalControl.has_lagrange_cost(ocp) + Test.@test (f.cost in (:lagrange, :bolza)) == + OptimalControl.has_lagrange_cost(ocp) Test.@test f.initial_time in (:fixed, :free) && f.final_time in (:fixed, :free) # a free time is a component of the variable - Test.@test f.variable_dimension > 0 || (f.initial_time === :fixed && f.final_time === :fixed) - Test.@test keys(f.constraints) == (:state_box, :control_box, :variable_box, :path, :boundary) + Test.@test f.variable_dimension > 0 || + (f.initial_time === :fixed && f.final_time === :fixed) + Test.@test keys(f.constraints) == + (:state_box, :control_box, :variable_box, :path, :boundary) Test.@test all(n -> n isa Int && n >= 0, f.constraints) end end diff --git a/test/suite/OptimalControl/test_methods.jl b/test/suite/OptimalControl/test_methods.jl index 508c6901b..701c0012f 100644 --- a/test/suite/OptimalControl/test_methods.jl +++ b/test/suite/OptimalControl/test_methods.jl @@ -1,4 +1,5 @@ -isdefined(Main, :TestMethods) || include(joinpath(@__DIR__, "..", "..", "common", "methods.jl")) +isdefined(Main, :TestMethods) || + include(joinpath(@__DIR__, "..", "..", "common", "methods.jl")) module TestMethodsOptimalControl @@ -10,8 +11,11 @@ const VERBOSE = isdefined(Main, :TestOptions) ? Main.TestOptions.VERBOSE : true const SHOWTIMING = isdefined(Main, :TestOptions) ? Main.TestOptions.SHOWTIMING : true function test_methods() - Test.@testset "OptimalControl methods of the extension" verbose = VERBOSE showtiming = SHOWTIMING begin - Main.TestMethods.test_methods(OptimalControlProblems.OptimalControlBackend(), :OptimalControlModels) + Test.@testset "OptimalControl methods of the extension" verbose = VERBOSE showtiming = + SHOWTIMING begin + Main.TestMethods.test_methods( + OptimalControlProblems.OptimalControlBackend(), :OptimalControlModels + ) end end diff --git a/test/suite/OptimalControl/test_problem.jl b/test/suite/OptimalControl/test_problem.jl index 9031b5cb4..b51d7bfef 100644 --- a/test/suite/OptimalControl/test_problem.jl +++ b/test/suite/OptimalControl/test_problem.jl @@ -6,9 +6,11 @@ module TestProblemOptimalControl using OptimalControlProblems: OptimalControlProblems # The API of a problem of this modeling; written once in `common/optimalcontrol_tests.jl` (#441). -test_problem() = Main.OptimalControlTests.test_problem( - OptimalControlProblems.OptimalControlBackend() -) +function test_problem() + return Main.OptimalControlTests.test_problem( + OptimalControlProblems.OptimalControlBackend() + ) +end end # module TestProblemOptimalControl diff --git a/test/suite/OptimalControl/test_reference_solution.jl b/test/suite/OptimalControl/test_reference_solution.jl index 900516d24..f77ad2c6c 100644 --- a/test/suite/OptimalControl/test_reference_solution.jl +++ b/test/suite/OptimalControl/test_reference_solution.jl @@ -14,8 +14,12 @@ const GRID_SIZES = (100, 400) # Constraint violation of the discretized problem at the analytic solution, and relative gap # of its objective to the analytic objective, on `grid_size` steps of the trapezoidal rule. function errors(ocp, solution, grid_size) - init = OptimalControl.build_initial_guess(ocp, (state=solution.state, control=solution.control)) - docp = OptimalControl.discretize(ocp, OptimalControl.Collocation(; grid_size=grid_size, scheme=:trapeze)) + init = OptimalControl.build_initial_guess( + ocp, (state=solution.state, control=solution.control) + ) + docp = OptimalControl.discretize( + ocp, OptimalControl.Collocation(; grid_size=grid_size, scheme=:trapeze) + ) nlp = OptimalControl.nlp_model(docp, init, OptimalControl.ADNLP()) x, meta = nlp.meta.x0, nlp.meta c = NLPModels.cons(nlp, x) @@ -33,7 +37,8 @@ end # solution or objective leaves them bounded away from zero. function test_reference_solution() backend = OCP.OptimalControlBackend() - Test.@testset "OptimalControl reference solution" verbose = VERBOSE showtiming = SHOWTIMING begin + Test.@testset "OptimalControl reference solution" verbose = VERBOSE showtiming = + SHOWTIMING begin Main.TestStatus.for_each_problem("reference_solution", backend) do problem solution = OCP.reference_solution_data(problem) isnothing(solution) && return nothing diff --git a/test/suite/OptimalControl/test_smoke.jl b/test/suite/OptimalControl/test_smoke.jl index ab115ed94..e3f203294 100644 --- a/test/suite/OptimalControl/test_smoke.jl +++ b/test/suite/OptimalControl/test_smoke.jl @@ -7,9 +7,11 @@ using OptimalControlProblems: OptimalControlProblems # Every problem builds, evaluates and runs a few iterations in each configuration; written once # in `common/optimalcontrol_tests.jl` (#441). -test_smoke() = Main.OptimalControlTests.test_smoke( - OptimalControlProblems.OptimalControlBackend() -) +function test_smoke() + return Main.OptimalControlTests.test_smoke( + OptimalControlProblems.OptimalControlBackend() + ) +end end # module TestSmokeOptimalControl diff --git a/test/suite/OptimalControlScalarized/test_methods.jl b/test/suite/OptimalControlScalarized/test_methods.jl index f22853318..400971e96 100644 --- a/test/suite/OptimalControlScalarized/test_methods.jl +++ b/test/suite/OptimalControlScalarized/test_methods.jl @@ -1,4 +1,5 @@ -isdefined(Main, :TestMethods) || include(joinpath(@__DIR__, "..", "..", "common", "methods.jl")) +isdefined(Main, :TestMethods) || + include(joinpath(@__DIR__, "..", "..", "common", "methods.jl")) module TestMethodsOptimalControlScalarized @@ -10,8 +11,11 @@ const VERBOSE = isdefined(Main, :TestOptions) ? Main.TestOptions.VERBOSE : true const SHOWTIMING = isdefined(Main, :TestOptions) ? Main.TestOptions.SHOWTIMING : true function test_methods() - Test.@testset "OptimalControlScalarized methods of the extension" verbose = VERBOSE showtiming = SHOWTIMING begin - Main.TestMethods.test_methods(OptimalControlProblems.OptimalControlScalarizedBackend(), :OptimalControlModels) + Test.@testset "OptimalControlScalarized methods of the extension" verbose = VERBOSE showtiming = + SHOWTIMING begin + Main.TestMethods.test_methods( + OptimalControlProblems.OptimalControlScalarizedBackend(), :OptimalControlModels + ) end end diff --git a/test/suite/OptimalControlScalarized/test_problem.jl b/test/suite/OptimalControlScalarized/test_problem.jl index 37f4f80ae..e6a529c14 100644 --- a/test/suite/OptimalControlScalarized/test_problem.jl +++ b/test/suite/OptimalControlScalarized/test_problem.jl @@ -6,9 +6,11 @@ module TestProblemOptimalControlScalarized using OptimalControlProblems: OptimalControlProblems # The API of a problem of this modeling; written once in `common/optimalcontrol_tests.jl` (#441). -test_problem() = Main.OptimalControlTests.test_problem( - OptimalControlProblems.OptimalControlScalarizedBackend() -) +function test_problem() + return Main.OptimalControlTests.test_problem( + OptimalControlProblems.OptimalControlScalarizedBackend() + ) +end end # module TestProblemOptimalControlScalarized diff --git a/test/suite/OptimalControlScalarized/test_smoke.jl b/test/suite/OptimalControlScalarized/test_smoke.jl index cc438b4e0..2da188237 100644 --- a/test/suite/OptimalControlScalarized/test_smoke.jl +++ b/test/suite/OptimalControlScalarized/test_smoke.jl @@ -7,9 +7,11 @@ using OptimalControlProblems: OptimalControlProblems # Every problem builds, evaluates and runs a few iterations in each configuration; written once # in `common/optimalcontrol_tests.jl` (#441). -test_smoke() = Main.OptimalControlTests.test_smoke( - OptimalControlProblems.OptimalControlScalarizedBackend() -) +function test_smoke() + return Main.OptimalControlTests.test_smoke( + OptimalControlProblems.OptimalControlScalarizedBackend() + ) +end end # module TestSmokeOptimalControlScalarized diff --git a/test/suite/comparison/test_features.jl b/test/suite/comparison/test_features.jl index 35af2b8e9..7d71269e7 100644 --- a/test/suite/comparison/test_features.jl +++ b/test/suite/comparison/test_features.jl @@ -15,7 +15,9 @@ const SHOWTIMING = isdefined(Main, :TestOptions) ? Main.TestOptions.SHOWTIMING : # dimensions of the state, the control and the variable (#441). Where they are read: the # JuMP model on a small grid, the continuous model of OptimalControl; nothing is solved. function test_features() - jump, vector, scalarized = OCP.JuMPBackend(), OCP.OptimalControlBackend(), OCP.OptimalControlScalarizedBackend() + jump, vector, scalarized = OCP.JuMPBackend(), + OCP.OptimalControlBackend(), + OCP.OptimalControlScalarizedBackend() Test.@testset "features: OptimalControl vs OptimalControlScalarized" verbose = VERBOSE showtiming = SHOWTIMING begin Main.TestStatus.for_each_problem("test_features", vector, scalarized) do problem diff --git a/test/suite/comparison/test_modelings.jl b/test/suite/comparison/test_modelings.jl index 966f75423..5c826f83f 100644 --- a/test/suite/comparison/test_modelings.jl +++ b/test/suite/comparison/test_modelings.jl @@ -28,7 +28,9 @@ function test_modelings() build = getfield(OCP, problem) data = build(jump; grid_size=2)[:problem_data] pb = build(other) - checks = Main.Continuous.compare(data, OCP.model(pb), OCP.initial_guess(pb)) + checks = Main.Continuous.compare( + data, OCP.model(pb), OCP.initial_guess(pb) + ) for (name, ok) in sort!(collect(checks); by=first) Test.@testset "$name" begin Test.@test ok diff --git a/test/suite/core/test_consistency.jl b/test/suite/core/test_consistency.jl index d652851b4..6840ffe3f 100644 --- a/test/suite/core/test_consistency.jl +++ b/test/suite/core/test_consistency.jl @@ -13,7 +13,11 @@ const EXT = joinpath(ROOT, "ext") # Directories of ext/ that hold one file per problem, and the extension of their files. const DATA_DIRECTORIES = ("MetaData" => ".jl", "Descriptions" => ".md") -names_in(dir, extension) = sort!([Symbol(first(splitext(f))) for f in readdir(dir) if endswith(f, extension)]) +function names_in(dir, extension) + return sort!([ + Symbol(first(splitext(f))) for f in readdir(dir) if endswith(f, extension) + ]) +end """Files of the problem `problem` in `ext/` (model files, metadata, description).""" function test_files() @@ -24,8 +28,11 @@ function test_files() Test.@test names_in(joinpath(EXT, dir), extension) == problems end # model directories: exactly the directories of the modeling table - model_dirs = sort!([d for d in readdir(EXT) if isdir(joinpath(EXT, d)) && endswith(d, "Models")]) - Test.@test model_dirs == sort!([spec.directory for spec in OCP.Modelings.MODELING_SPECS]) + model_dirs = sort!([ + d for d in readdir(EXT) if isdir(joinpath(EXT, d)) && endswith(d, "Models") + ]) + Test.@test model_dirs == + sort!([spec.directory for spec in OCP.Modelings.MODELING_SPECS]) for spec in OCP.Modelings.MODELING_SPECS files = names_in(joinpath(EXT, spec.directory), ".jl") # every model file belongs to a problem that has metadata @@ -35,7 +42,10 @@ function test_files() end # every problem has at least one modeling for problem in problems - Test.@test any(spec -> isfile(joinpath(EXT, spec.directory, "$problem.jl")), OCP.Modelings.MODELING_SPECS) + Test.@test any( + spec -> isfile(joinpath(EXT, spec.directory, "$problem.jl")), + OCP.Modelings.MODELING_SPECS, + ) end end end @@ -89,7 +99,9 @@ function test_reference_objectives() Test.@testset "reference objectives" verbose = VERBOSE begin # generated by tools/references/update.jl, never written by hand: its header (#409) for file in readdir(OCP.References.REFERENCES_PATH; join=true) - Test.@test startswith(read(file, String), "# Reference objectives of the problem") + Test.@test startswith( + read(file, String), "# Reference objectives of the problem" + ) end for problem in OCP.problems(; status=:all) data = OCP.problem_metadata(problem) @@ -103,7 +115,8 @@ function test_reference_objectives() Test.@test first(entry.solutions) == entry.value Test.@test issorted(entry.solutions) Test.@test entry.agreement == (length(entry.solutions) == 1) - kind(x) = OCP.solution_kind(problem, x; grid_size=entry.grid_size, scheme=scheme) + kind(x) = + OCP.solution_kind(problem, x; grid_size=entry.grid_size, scheme=scheme) Test.@test kind(entry.value) === :best Test.@test all(s -> kind(s) in (:best, :local), entry.solutions) Test.@test all(s -> kind(s) === :local, entry.solutions[2:end]) @@ -113,12 +126,19 @@ function test_reference_objectives() # has none, compute the references again (tools/references/update.jl) Test.@test length(entry.references) == length(entry.solutions) Test.@test [r.objective for r in entry.references] == entry.solutions - Test.@test all(r -> r.grid_size == entry.grid_size && r.scheme === scheme, entry.references) + Test.@test all( + r -> r.grid_size == entry.grid_size && r.scheme === scheme, + entry.references, + ) end valid = [name for (name, s) in pairs(OCP.status(problem)) if s === :valid] (isempty(valid) || !isnothing(OCP.reference_objective(problem))) && continue Main.TestStatus.report!( - "reference objectives", problem, join(valid, ", "), :valid, "no reference objective", + "reference objectives", + problem, + join(valid, ", "), + :valid, + "no reference objective", ) end end @@ -141,19 +161,26 @@ end function test_no_handwritten_list() Test.@testset "no hand-written list" verbose = VERBOSE begin problems = OCP.problems(; status=:all) - pattern = Regex("(? haskey(OCP.problem_metadata(p), :reference_solution), OCP.problems(; status=:all)) + problems = filter( + p -> haskey(OCP.problem_metadata(p), :reference_solution), + OCP.problems(; status=:all), + ) Test.@test !isempty(problems) for problem in problems solution = OCP.reference_solution_data(problem) @@ -197,7 +229,8 @@ function test_reference_solutions() Test.@test isfinite(solution.objective) && !isempty(solution.source) t0, tf = OCP.parameters_data(problem).t0, OCP.parameters_data(problem).tf for t in range(t0, tf; length=5) - Test.@test all(isfinite, solution.state(t)) && all(isfinite, solution.control(t)) + Test.@test all(isfinite, solution.state(t)) && + all(isfinite, solution.control(t)) end end end diff --git a/test/suite/core/test_modelings.jl b/test/suite/core/test_modelings.jl index 3bacfdcca..6007137d7 100644 --- a/test/suite/core/test_modelings.jl +++ b/test/suite/core/test_modelings.jl @@ -36,8 +36,9 @@ function test_modelings() ) == listed end for a in BACKENDS, b in BACKENDS - Test.@test OptimalControlProblems.problems(a, b) == - intersect(OptimalControlProblems.problems(a), OptimalControlProblems.problems(b)) + Test.@test OptimalControlProblems.problems(a, b) == intersect( + OptimalControlProblems.problems(a), OptimalControlProblems.problems(b) + ) end Test.@test_throws CTBase.IncorrectArgument OptimalControlProblems.problems(; status=:unknown @@ -69,10 +70,15 @@ function test_modelings() end end - Test.@testset "features without OptimalControl" verbose = VERBOSE showtiming = SHOWTIMING begin + Test.@testset "features without OptimalControl" verbose = VERBOSE showtiming = + SHOWTIMING begin # computed from the OptimalControl model: the extension is needed (#376) - problem = first(OptimalControlProblems.problems(OptimalControlProblems.OptimalControlBackend())) - Test.@test_throws CTBase.Exceptions.ExtensionError OptimalControlProblems.features(problem) + problem = first( + OptimalControlProblems.problems(OptimalControlProblems.OptimalControlBackend()) + ) + Test.@test_throws CTBase.Exceptions.ExtensionError OptimalControlProblems.features( + problem + ) end Test.@testset "generated documentation" verbose = VERBOSE showtiming = SHOWTIMING begin diff --git a/test/suite/core/test_parameters.jl b/test/suite/core/test_parameters.jl index f1251d44b..1ae983360 100644 --- a/test/suite/core/test_parameters.jl +++ b/test/suite/core/test_parameters.jl @@ -12,7 +12,8 @@ function test_parameters() Test.@test OptimalControlProblems.Metadata.merge(nothing, nothing) === nothing Test.@test OptimalControlProblems.Metadata.merge((tf=1,), nothing) == (tf=1,) Test.@test OptimalControlProblems.Metadata.merge((tf=1,), (tf=2,)) == (tf=2,) - Test.@test OptimalControlProblems.Metadata.merge((tf=1, a=2), (tf=2,)) == (tf=2, a=2) + Test.@test OptimalControlProblems.Metadata.merge((tf=1, a=2), (tf=2,)) == + (tf=2, a=2) Test.@test_throws CTBase.Exceptions.PreconditionError OptimalControlProblems.Metadata.merge( nothing, (tf=1,) ) @@ -40,7 +41,9 @@ function test_parameters() # the default parameters, given or not expected = data[:reference_solution](data[:parameters]) Test.@test solution.objective == expected.objective - given = OptimalControlProblems.reference_solution_data(problem, data[:parameters]) + given = OptimalControlProblems.reference_solution_data( + problem, data[:parameters] + ) Test.@test given.objective == expected.objective else Test.@test isnothing(solution) @@ -49,7 +52,9 @@ function test_parameters() end Test.@testset "Bryson–Denham solution" verbose = VERBOSE showtiming = SHOWTIMING begin solve(ℓ; t0=0, tf=1, x_t0=(0, 1), x_tf=(0, -1), weight=1, kwargs...) = - OptimalControlProblems.Metadata._bryson_denham_solution(t0, tf, x_t0, x_tf, ℓ; weight, kwargs...) + OptimalControlProblems.Metadata._bryson_denham_solution( + t0, tf, x_t0, x_tf, ℓ; weight, kwargs... + ) solution = solve(0.1) Test.@test solution.objective ≈ 8 / 0.9 Test.@test solve(0.1; weight=0.5).objective ≈ 4 / 0.9 diff --git a/test/suite/core/test_runner.jl b/test/suite/core/test_runner.jl index 6b56434ba..85f66110a 100644 --- a/test/suite/core/test_runner.jl +++ b/test/suite/core/test_runner.jl @@ -21,7 +21,8 @@ function test_runner() Test.@test sel(["*kwargs*"]) == (["JuMP", "OptimalControl"], ["*kwargs*"]) # named: only those, patterns apart Test.@test sel(["JuMP"]) == (["JuMP"], String[]) - Test.@test sel(["ModelingToolkit", "*solve*"]) == (["ModelingToolkit"], ["*solve*"]) + Test.@test sel(["ModelingToolkit", "*solve*"]) == + (["ModelingToolkit"], ["*solve*"]) # `core` alone: no other environment (it always runs in-process) Test.@test sel(["core"]) == (String[], String[]) Test.@test sel(["core", "JuMP"]) == (["JuMP"], String[]) @@ -30,19 +31,24 @@ function test_runner() Test.@testset "mode" begin Test.@test R.split_mode(String[]) == (:suite, String[]) Test.@test R.split_mode(["JuMP", "cron"]) == (:cron, ["JuMP"]) - Test.@test R.split_mode(["convergence", "*solve*"]) == (:convergence, ["*solve*"]) - Test.@test R.split_mode(["robustness", "OptimalControl"]) == (:robustness, ["OptimalControl"]) + Test.@test R.split_mode(["convergence", "*solve*"]) == + (:convergence, ["*solve*"]) + Test.@test R.split_mode(["robustness", "OptimalControl"]) == + (:robustness, ["OptimalControl"]) Test.@test_throws ArgumentError R.split_mode(["cron", "convergence"]) Test.@test_throws ArgumentError R.split_mode(["cron", "robustness"]) mktempdir() do root suite, cron = joinpath(root, "suite"), joinpath(root, "cron") robustness = joinpath(root, "robustness") - mkpath(joinpath(suite, "a")); mkpath(joinpath(cron, "a")); mkpath(joinpath(suite, "b")) + mkpath(joinpath(suite, "a")) + mkpath(joinpath(cron, "a")) + mkpath(joinpath(suite, "b")) mkpath(joinpath(robustness, "a")) dirs(group, mode) = R.directories(group, suite, cron, robustness; mode=mode) Test.@test dirs("a", :suite) == [joinpath(suite, "a")] Test.@test dirs("a", :cron) == [joinpath(cron, "a")] - Test.@test dirs("a", :convergence) == [joinpath(suite, "a"), joinpath(cron, "a")] + Test.@test dirs("a", :convergence) == + [joinpath(suite, "a"), joinpath(cron, "a")] # the robustness directories run only when asked for, alone Test.@test dirs("a", :robustness) == [joinpath(robustness, "a")] Test.@test isempty(dirs("b", :robustness)) @@ -57,7 +63,8 @@ function test_runner() Test.@test R.split_problems(["JuMP", "problem=a,b", "*solve*"]) == (["a", "b"], ["JuMP", "*solve*"]) # several arguments add up, duplicates and empty names go - Test.@test R.split_problems(["problem=a,,b", "problem=b,c"]) == (["a", "b", "c"], String[]) + Test.@test R.split_problems(["problem=a,,b", "problem=b,c"]) == + (["a", "b", "c"], String[]) end Test.@testset "run" begin diff --git a/tools/references/references.jl b/tools/references/references.jl index 6fe194544..893fb9d42 100644 --- a/tools/references/references.jl +++ b/tools/references/references.jl @@ -50,11 +50,15 @@ function read_results(dirs) "results recorded before #409, solve again", ) environment = joinpath(root, replace(file, "-results.tsv" => "-environment.toml")) - isfile(environment) || error("$(environment) is missing: its results cannot say how they were obtained") + isfile(environment) || error( + "$(environment) is missing: its results cannot say how they were obtained" + ) for line in lines[2:end] cells = split(line, '\t') length(cells) == length(header) || continue - row = Dict{String,String}(String(h) => String(c) for (h, c) in zip(header, cells)) + row = Dict{String,String}( + String(h) => String(c) for (h, c) in zip(header, cells) + ) row["platform"] = platform row["environment"] = environment push!(rows, row) @@ -64,14 +68,16 @@ function read_results(dirs) end """The environment of the run of `row` (`-environment.toml`), read once per file.""" -environment(row) = get!(() -> TOML.parsefile(row["environment"]), ENVIRONMENTS, row["environment"]) +function environment(row) + return get!(() -> TOML.parsefile(row["environment"]), ENVIRONMENTS, row["environment"]) +end const ENVIRONMENTS = Dict{String,Dict{String,Any}}() # Statuses of a solve that stopped at an acceptable point, not at the requested tolerance: # still a solution (#409), ranked after a strict convergence when one represents a solution. const ACCEPTABLE = ("acceptable", "ALMOST_LOCALLY_SOLVED", "SOLVED_TO_ACCEPTABLE_LEVEL") -parse_violation(cell) = isempty(cell) ? Inf : (v = parse(Float64, cell); isnan(v) ? Inf : v) +parse_violation(cell) = isempty(cell) ? Inf : (v=parse(Float64, cell); isnan(v) ? Inf : v) """ representative(rows) -> Dict{String,String} @@ -158,7 +164,8 @@ function references(rows, defaults; run::AbstractString) "configuration" => r["configuration"], "platform" => r["platform"], "objective" => parse(Float64, r["objective"]), - ) for r in sort(group; by=r -> (r["modeling"], r["configuration"], r["platform"])) + ) for + r in sort(group; by=r -> (r["modeling"], r["configuration"], r["platform"])) ] get!(tables, problem, Dict{String,Any}())[scheme] = Dict{String,Any}( # the objective of the representative of the best solution: a solve that can be @@ -190,8 +197,9 @@ function solutions(rows) groups = Vector{Vector{Dict{String,String}}}() for r in sort(rows; by=objective) if isempty(groups) || - OptimalControlProblems.References._relative_gap(objective(r), objective(first(last(groups)))) > - SAME_SOLUTION + OptimalControlProblems.References._relative_gap( + objective(r), objective(first(last(groups))) + ) > SAME_SOLUTION push!(groups, [r]) else push!(last(groups), r) @@ -202,7 +210,8 @@ function solutions(rows) return Dict{String,Any}( "objective" => objective(chosen), "solves" => length(g), - "configurations" => sort!(unique(["$(r["modeling"]) $(r["configuration"])" for r in g])), + "configurations" => + sort!(unique(["$(r["modeling"]) $(r["configuration"])" for r in g])), "reference" => reference(chosen), ) end @@ -229,7 +238,7 @@ function write_references(dir, tables) merge!(data, schemes) open(file, "w") do io print(io, HEADER, "\n") - TOML.print(io, data; sorted=true) + return TOML.print(io, data; sorted=true) end push!(written, file) end @@ -239,7 +248,9 @@ end """Lines of the summary printed by the script: one per problem and scheme.""" function summary(tables) lines = String[] - for problem in sort!(collect(keys(tables))), scheme in sort!(collect(keys(tables[problem]))) + for problem in sort!(collect(keys(tables))), + scheme in sort!(collect(keys(tables[problem]))) + t = tables[problem][scheme] flag = t["agreement"] ? "" : " <-- $(length(t["solutions"])) solutions" push!( diff --git a/tools/references/update.jl b/tools/references/update.jl index 31a320826..ba80c6785 100644 --- a/tools/references/update.jl +++ b/tools/references/update.jl @@ -25,7 +25,8 @@ function main(args) i += 1 end end - isempty(dirs) && error("usage: julia --project=. tools/references/update.jl [--run ] ...") + isempty(dirs) && + error("usage: julia --project=. tools/references/update.jl [--run ] ...") defaults = Dict( problem => ( grid_size=OptimalControlProblems.grid_size_data(problem), @@ -34,11 +35,15 @@ function main(args) ) rows = ReferenceObjectives.read_results(dirs) tables = ReferenceObjectives.references(rows, defaults; run=run) - files = ReferenceObjectives.write_references(OptimalControlProblems.References.REFERENCES_PATH, tables) + files = ReferenceObjectives.write_references( + OptimalControlProblems.References.REFERENCES_PATH, tables + ) foreach(println, ReferenceObjectives.summary(tables)) missing_problems = setdiff(keys(defaults), keys(tables)) - isempty(missing_problems) || - println("No converged solve, no reference: ", join(sort!(collect(missing_problems)), ", ")) + isempty(missing_problems) || println( + "No converged solve, no reference: ", + join(sort!(collect(missing_problems)), ", "), + ) println("$(length(rows)) results read, $(length(files)) files written.") return nothing end