Merge pull request #306 from control-toolbox/auto-juliaformatter-pr

ocots · web-flow · commit 4da98a012be6 · 2026-04-21T09:33:40.000+02:00
[AUTO] JuliaFormatter.jl run
diff --git a/src/CTModels.jl b/src/CTModels.jl
@@ -91,4 +91,4 @@ using .Serialization
 include(joinpath(@__DIR__, "Init", "Init.jl"))
 using .Init
 
-end
+end
diff --git a/src/Display/definition.jl b/src/Display/definition.jl
@@ -44,5 +44,6 @@ Display method for any [`AbstractDefinition`](@ref).
 
 Delegates to [`_print_abstract_definition`](@ref).
 """
-Base.show(io::IO, ::MIME"text/plain", d::AbstractDefinition) =
+function Base.show(io::IO, ::MIME"text/plain", d::AbstractDefinition)
     _print_abstract_definition(io, d)
+end
diff --git a/src/OCP/Building/model.jl b/src/OCP/Building/model.jl
@@ -136,10 +136,14 @@ function _dedup_box_constraints!(
 
     # sort by component index for readability
     perm = sortperm(new_inds)
-    resize!(inds, length(new_inds)); inds .= new_inds[perm]
-    resize!(lbs, length(new_lbs)); lbs .= new_lbs[perm]
-    resize!(ubs, length(new_ubs)); ubs .= new_ubs[perm]
-    resize!(labels, length(new_labels)); labels .= new_labels[perm]
+    resize!(inds, length(new_inds));
+    inds .= new_inds[perm]
+    resize!(lbs, length(new_lbs));
+    lbs .= new_lbs[perm]
+    resize!(ubs, length(new_ubs));
+    ubs .= new_ubs[perm]
+    resize!(labels, length(new_labels));
+    labels .= new_labels[perm]
     empty!(aliases)
     append!(aliases, new_aliases[perm])
     return nothing
diff --git a/src/OCP/Building/solution.jl b/src/OCP/Building/solution.jl
@@ -1338,16 +1338,10 @@ function Base.show(io::IO, ::MIME"text/plain", sol::Solution)
     if variable_dimension(sol) > 0
         components = variable_components(sol)
         var_name = variable_name(sol)
-        
+
         # Simplified case: dimension 1 and name identical
         if variable_dimension(sol) == 1 && var_name == components[1]
-            println(
-                io,
-                "\n• Variable: ",
-                var_name,
-                " = ",
-                variable(sol),
-            )
+            println(io, "\n• Variable: ", var_name, " = ", variable(sol))
         else
             println(
                 io,
@@ -1359,7 +1353,8 @@ function Base.show(io::IO, ::MIME"text/plain", sol::Solution)
                 variable(sol),
             )
         end
-        if dim_dual_variable_constraints_box(sol) > 0 && dim_variable_constraints_box(model(sol)) > 0
+        if dim_dual_variable_constraints_box(sol) > 0 &&
+            dim_variable_constraints_box(model(sol)) > 0
             println(io, "  │  Var dual (lb) : ", variable_constraints_lb_dual(sol))
             println(io, "  └─ Var dual (ub) : ", variable_constraints_ub_dual(sol))
         end
diff --git a/src/OCP/Components/definition.jl b/src/OCP/Components/definition.jl
@@ -64,7 +64,9 @@ Since no symbolic definition was attached, the canonical empty expression
 
 - `Expr`: An empty block expression `:(begin end)`.
 """
-expression(::EmptyDefinition)::Expr = :(begin end)
+expression(::EmptyDefinition)::Expr = :(
+    begin end
+)
 
 """
 $(TYPEDSIGNATURES)
diff --git a/src/OCP/OCP.jl b/src/OCP/OCP.jl
@@ -125,7 +125,8 @@ export path_constraints_nl, boundary_constraints_nl
 export state_constraints_box, control_constraints_box, variable_constraints_box
 export dim_path_constraints_nl, dim_boundary_constraints_nl
 export dim_state_constraints_box, dim_control_constraints_box, dim_variable_constraints_box
-export dim_dual_state_constraints_box, dim_dual_control_constraints_box, dim_dual_variable_constraints_box
+export dim_dual_state_constraints_box,
+    dim_dual_control_constraints_box, dim_dual_variable_constraints_box
 export state, control, variable, costate, objective
 export dynamics, mayer, lagrange
 export definition, expression, dual
diff --git a/src/OCP/Types/model.jl b/src/OCP/Types/model.jl
@@ -107,7 +107,6 @@ struct Model{
     end
 end
 
-
 """
 $(TYPEDEF)
 
diff --git a/test/suite/display/test_print.jl b/test/suite/display/test_print.jl
@@ -29,14 +29,18 @@ function test_print()
 
             Test.@testset "_print_abstract_definition returns false for EmptyDefinition" begin
                 io = IOBuffer()
-                result = CTModels.Display._print_abstract_definition(io, CTModels.EmptyDefinition())
+                result = CTModels.Display._print_abstract_definition(
+                    io, CTModels.EmptyDefinition()
+                )
                 Test.@test result == false
                 Test.@test isempty(String(take!(io)))
             end
 
             Test.@testset "_print_abstract_definition returns true for Definition" begin
                 io = IOBuffer()
-                result = CTModels.Display._print_abstract_definition(io, CTModels.Definition(:(x = 1)))
+                result = CTModels.Display._print_abstract_definition(
+                    io, CTModels.Definition(:(x = 1))
+                )
                 Test.@test result == true
                 Test.@test occursin("Abstract definition:", String(take!(io)))
             end
@@ -126,7 +130,9 @@ function test_print()
                 CTModels.variable!(pre, 0)
                 dyn!(r, t, x, u, v) = r .= 0
                 CTModels.dynamics!(pre, dyn!)
-                CTModels.objective!(pre, :min; mayer=(x0, xf, v) -> 0.0, lagrange=(t, x, u, v) -> 0.0)
+                CTModels.objective!(
+                    pre, :min; mayer=(x0, xf, v) -> 0.0, lagrange=(t, x, u, v) -> 0.0
+                )
                 CTModels.time_dependence!(pre; autonomous=false)
 
                 model = CTModels.build(pre)
@@ -149,7 +155,9 @@ function test_print()
                 CTModels.variable!(pre, 0)
                 dyn!(r, t, x, u, v) = r .= 0
                 CTModels.dynamics!(pre, dyn!)
-                CTModels.objective!(pre, :min; mayer=(x0, xf, v) -> 0.0, lagrange=(t, x, u, v) -> 0.0)
+                CTModels.objective!(
+                    pre, :min; mayer=(x0, xf, v) -> 0.0, lagrange=(t, x, u, v) -> 0.0
+                )
                 CTModels.time_dependence!(pre; autonomous=false)
 
                 io = IOBuffer()
diff --git a/test/suite/ocp/test_constraints.jl b/test/suite/ocp/test_constraints.jl
@@ -290,12 +290,7 @@ function test_constraints()
             Test.@testset "single full-range declaration preserves order" begin
                 ocp = _make_min_premodel(; state_dim=3)
                 CTModels.constraint!(
-                    ocp,
-                    :state;
-                    rg=1:3,
-                    lb=[0.0, 1.0, 2.0],
-                    ub=[1.0, 2.0, 3.0],
-                    label=:s,
+                    ocp, :state; rg=1:3, lb=[0.0, 1.0, 2.0], ub=[1.0, 2.0, 3.0], label=:s
                 )
                 m = CTModels.build(ocp)
                 cs = CTModels.state_constraints_box(m)
@@ -323,12 +318,8 @@ function test_constraints()
 
             Test.@testset "duplicate: intersection applied, per-component uniqueness" begin
                 ocp = _make_min_premodel(; state_dim=2)
-                CTModels.constraint!(
-                    ocp, :state; rg=1:1, lb=[0.0], ub=[2.0], label=:s1
-                )
-                CTModels.constraint!(
-                    ocp, :state; rg=1:1, lb=[0.5], ub=[1.5], label=:s2
-                )
+                CTModels.constraint!(ocp, :state; rg=1:1, lb=[0.0], ub=[2.0], label=:s1)
+                CTModels.constraint!(ocp, :state; rg=1:1, lb=[0.5], ub=[1.5], label=:s2)
                 # warning emitted once at build; storage holds one entry per component
                 m = (Test.@test_logs (:warn, r"Multiple bound declarations") CTModels.build(
                     ocp
@@ -348,20 +339,10 @@ function test_constraints()
             Test.@testset "overlapping ranges" begin
                 ocp = _make_min_premodel(; state_dim=3)
                 CTModels.constraint!(
-                    ocp,
-                    :state;
-                    rg=1:2,
-                    lb=[0.0, 1.0],
-                    ub=[1.0, 2.0],
-                    label=:a,
+                    ocp, :state; rg=1:2, lb=[0.0, 1.0], ub=[1.0, 2.0], label=:a
                 )
                 CTModels.constraint!(
-                    ocp,
-                    :state;
-                    rg=2:3,
-                    lb=[0.5, 1.5],
-                    ub=[1.5, 2.5],
-                    label=:b,
+                    ocp, :state; rg=2:3, lb=[0.5, 1.5], ub=[1.5, 2.5], label=:b
                 )
                 m = (Test.@test_logs (:warn, r"component 2") CTModels.build(ocp))
                 cs = CTModels.state_constraints_box(m)
diff --git a/test/suite/ocp/test_definition.jl b/test/suite/ocp/test_definition.jl
@@ -109,7 +109,9 @@ function test_definition()
             CTModels.variable!(pre, 0)
             dyn!(r, t, x, u, v) = r .= 0
             CTModels.dynamics!(pre, dyn!)
-            CTModels.objective!(pre, :min; mayer=(x0, xf, v) -> 0.0, lagrange=(t, x, u, v) -> 0.0)
+            CTModels.objective!(
+                pre, :min; mayer=(x0, xf, v) -> 0.0, lagrange=(t, x, u, v) -> 0.0
+            )
             CTModels.time_dependence!(pre; autonomous=false)
 
             model = CTModels.build(pre)
@@ -127,7 +129,9 @@ function test_definition()
             CTModels.variable!(pre, 0)
             dyn!(r, t, x, u, v) = r .= 0
             CTModels.dynamics!(pre, dyn!)
-            CTModels.objective!(pre, :min; mayer=(x0, xf, v) -> 0.0, lagrange=(t, x, u, v) -> 0.0)
+            CTModels.objective!(
+                pre, :min; mayer=(x0, xf, v) -> 0.0, lagrange=(t, x, u, v) -> 0.0
+            )
             expr = quote
                 t ∈ [0, 1], time
                 x ∈ R, state
diff --git a/test/suite/ocp/test_dual_model.jl b/test/suite/ocp/test_dual_model.jl
@@ -145,8 +145,7 @@ function test_dual_model()
             # --- State box ---
             Test.@testset "state - single full-range declaration" begin
                 ocp = _build_model_with_state_box(;
-                    state_dim=2,
-                    constraints=[(1:2, [0.0, 0.0], [1.0, 1.0], :s)],
+                    state_dim=2, constraints=[(1:2, [0.0, 0.0], [1.0, 1.0], :s)]
                 )
                 m = CTModels.build(ocp)
                 # 2 declarations → matrix must have 2 columns
@@ -160,8 +159,7 @@ function test_dual_model()
 
             Test.@testset "state - partial range not starting at 1" begin
                 ocp = _build_model_with_state_box(;
-                    state_dim=3,
-                    constraints=[(2:3, [0.0, 0.0], [1.0, 1.0], :s)],
+                    state_dim=3, constraints=[(2:3, [0.0, 0.0], [1.0, 1.0], :s)]
                 )
                 m = CTModels.build(ocp)
                 # Per-component convention: matrix has state_dim=3 columns.
@@ -178,10 +176,7 @@ function test_dual_model()
             Test.@testset "state - two labels on same component: share per-component dual" begin
                 ocp = _build_model_with_state_box(;
                     state_dim=1,
-                    constraints=[
-                        (1:1, [0.0], [2.0], :s1),
-                        (1:1, [0.5], [1.5], :s2),
-                    ],
+                    constraints=[(1:1, [0.0], [2.0], :s1), (1:1, [0.5], [1.5], :s2)],
                 )
                 m = (Test.@test_logs (:warn, r"Multiple bound declarations") CTModels.build(
                     ocp
@@ -200,8 +195,7 @@ function test_dual_model()
             # --- Control box ---
             Test.@testset "control - single full-range declaration" begin
                 ocp = _build_model_with_control_box(;
-                    control_dim=2,
-                    constraints=[(1:2, [0.0, 0.0], [1.0, 1.0], :c)],
+                    control_dim=2, constraints=[(1:2, [0.0, 0.0], [1.0, 1.0], :c)]
                 )
                 m = CTModels.build(ocp)
                 lb = [1.0 10.0; 2.0 20.0; 3.0 30.0]
@@ -213,8 +207,7 @@ function test_dual_model()
 
             Test.@testset "control - partial range not starting at 1" begin
                 ocp = _build_model_with_control_box(;
-                    control_dim=3,
-                    constraints=[(2:3, [0.0, 0.0], [1.0, 1.0], :c)],
+                    control_dim=3, constraints=[(2:3, [0.0, 0.0], [1.0, 1.0], :c)]
                 )
                 m = CTModels.build(ocp)
                 # Per-component: matrix has control_dim=3 columns.
@@ -228,10 +221,7 @@ function test_dual_model()
             Test.@testset "control - two labels on same component: share per-component dual" begin
                 ocp = _build_model_with_control_box(;
                     control_dim=1,
-                    constraints=[
-                        (1:1, [0.0], [2.0], :c1),
-                        (1:1, [0.5], [1.5], :c2),
-                    ],
+                    constraints=[(1:1, [0.0], [2.0], :c1), (1:1, [0.5], [1.5], :c2)],
                 )
                 m = (Test.@test_logs (:warn, r"Multiple bound declarations") CTModels.build(
                     ocp
@@ -246,8 +236,7 @@ function test_dual_model()
             # --- Variable box ---
             Test.@testset "variable - single full-range declaration" begin
                 ocp = _build_model_with_variable_box(;
-                    variable_dim=2,
-                    constraints=[(1:2, [0.0, 0.0], [1.0, 1.0], :vbl)],
+                    variable_dim=2, constraints=[(1:2, [0.0, 0.0], [1.0, 1.0], :vbl)]
                 )
                 m = CTModels.build(ocp)
                 lb = [1.0, 10.0]
@@ -259,8 +248,7 @@ function test_dual_model()
 
             Test.@testset "variable - partial range not starting at 1" begin
                 ocp = _build_model_with_variable_box(;
-                    variable_dim=3,
-                    constraints=[(2:3, [0.0, 0.0], [1.0, 1.0], :vbl)],
+                    variable_dim=3, constraints=[(2:3, [0.0, 0.0], [1.0, 1.0], :vbl)]
                 )
                 m = CTModels.build(ocp)
                 # Per-component: duals are variable_dim-sized vectors.
@@ -274,10 +262,7 @@ function test_dual_model()
             Test.@testset "variable - two labels on same component: share per-component dual" begin
                 ocp = _build_model_with_variable_box(;
                     variable_dim=1,
-                    constraints=[
-                        (1:1, [0.0], [2.0], :v1),
-                        (1:1, [0.5], [1.5], :v2),
-                    ],
+                    constraints=[(1:1, [0.0], [2.0], :v1), (1:1, [0.5], [1.5], :v2)],
                 )
                 m = (Test.@test_logs (:warn, r"Multiple bound declarations") CTModels.build(
                     ocp
diff --git a/test/suite/ocp/test_ocp_model_types.jl b/test/suite/ocp/test_ocp_model_types.jl
@@ -160,8 +160,12 @@ function test_ocp_model_types()
             dyn!(r, t, x, u, v) = r .= 0
             mayer_fn(x0, xf, v) = 0.0
 
-            function build_model(; with_variable=false, with_control=true,
-                                   autonomous=true, with_definition=false)
+            function build_model(;
+                with_variable=false,
+                with_control=true,
+                autonomous=true,
+                with_definition=false,
+            )
                 ocp = CTModels.PreModel()
                 CTModels.time!(ocp; t0=0.0, tf=1.0)
                 CTModels.state!(ocp, 2)

-Original file line number
+Diff line change
     end
 end
+-
 """
 $(TYPEDEF)