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

[AUTO] JuliaFormatter.jl run

Author: ocots

src/constraints.jl

@@ -171,7 +171,9 @@ end
 constraint(ocp::Model, label::Symbol)::Tuple = ocp.constraints.dict[label]
 
 (
-    path_constraints_nl(ocp::Model{T,S,C,V,D,O,ConstraintsModel{TP, TV1, TB, TS, TC, TV2, ConstraintsDictType}})::TP
+    path_constraints_nl(
+        ocp::Model{T,S,C,V,D,O,ConstraintsModel{TP,TV1,TB,TS,TC,TV2,ConstraintsDictType}}
+    )::TP
 ) where {
     T<:TimesModel,
     S<:AbstractStateModel,
@@ -188,7 +190,9 @@ constraint(ocp::Model, label::Symbol)::Tuple = ocp.constraints.dict[label]
 } = ocp.constraints.path_nl
 
 (
-    variable_constraints_nl(ocp::Model{T,S,C,V,D,O,ConstraintsModel{TP, TV1, TB, TS, TC, TV2, ConstraintsDictType}})::TV1
+    variable_constraints_nl(
+        ocp::Model{T,S,C,V,D,O,ConstraintsModel{TP,TV1,TB,TS,TC,TV2,ConstraintsDictType}}
+    )::TV1
 ) where {
     T<:TimesModel,
     S<:AbstractStateModel,
@@ -205,7 +209,9 @@ constraint(ocp::Model, label::Symbol)::Tuple = ocp.constraints.dict[label]
 } = ocp.constraints.variable_nl
 
 (
-    boundary_constraints_nl(ocp::Model{T,S,C,V,D,O,ConstraintsModel{TP, TV1, TB, TS, TC, TV2, ConstraintsDictType}})::TB
+    boundary_constraints_nl(
+        ocp::Model{T,S,C,V,D,O,ConstraintsModel{TP,TV1,TB,TS,TC,TV2,ConstraintsDictType}}
+    )::TB
 ) where {
     T<:TimesModel,
     S<:AbstractStateModel,
@@ -222,7 +228,9 @@ constraint(ocp::Model, label::Symbol)::Tuple = ocp.constraints.dict[label]
 } = ocp.constraints.boundary_nl
 
 (
-    state_constraints_box(ocp::Model{T,S,C,V,D,O,ConstraintsModel{TP, TV1, TB, TS, TC, TV2, ConstraintsDictType}})::TS
+    state_constraints_box(
+        ocp::Model{T,S,C,V,D,O,ConstraintsModel{TP,TV1,TB,TS,TC,TV2,ConstraintsDictType}}
+    )::TS
 ) where {
     T<:TimesModel,
     S<:AbstractStateModel,
@@ -239,7 +247,9 @@ constraint(ocp::Model, label::Symbol)::Tuple = ocp.constraints.dict[label]
 } = ocp.constraints.state_box
 
 (
-    control_constraints_box(ocp::Model{T,S,C,V,D,O,ConstraintsModel{TP, TV1, TB, TS, TC, TV2, ConstraintsDictType}})::TC
+    control_constraints_box(
+        ocp::Model{T,S,C,V,D,O,ConstraintsModel{TP,TV1,TB,TS,TC,TV2,ConstraintsDictType}}
+    )::TC
 ) where {
     T<:TimesModel,
     S<:AbstractStateModel,
@@ -256,7 +266,9 @@ constraint(ocp::Model, label::Symbol)::Tuple = ocp.constraints.dict[label]
 } = ocp.constraints.control_box
 
 (
-    variable_constraints_box(ocp::Model{T,S,C,V,D,O,ConstraintsModel{TP, TV1, TB, TS, TC, TV2, ConstraintsDictType}})::TV2
+    variable_constraints_box(
+        ocp::Model{T,S,C,V,D,O,ConstraintsModel{TP,TV1,TB,TS,TC,TV2,ConstraintsDictType}}
+    )::TV2
 ) where {
     T<:TimesModel,
     S<:AbstractStateModel,

src/control.jl

@@ -81,7 +81,8 @@ function control!(
     __is_control_set(ocp) &&
         throw(CTBase.UnauthorizedCall("the control has already been set."))
 
-    (m > 0) && (size(components_names, 1) ≠ m) &&
+    (m > 0) &&
+        (size(components_names, 1) ≠ m) &&
         throw(
             CTBase.IncorrectArgument(
                 "the number of control names must be equal to the control dimension"

src/model.jl

@@ -1,5 +1,4 @@
 function build_constraints(constraints::ConstraintsDictType)::ConstraintsModel
-
     path_cons_nl_f = Vector{Function}() # nonlinear path constraints
     path_cons_nl_dim = Vector{Int}()
     path_cons_nl_lb = Vector{ctNumber}()
@@ -116,9 +115,8 @@ function build_constraints(constraints::ConstraintsDictType)::ConstraintsModel
         (state_cons_box_lb, state_cons_box_ind, state_cons_box_ub),
         (control_cons_box_lb, control_cons_box_ind, control_cons_box_ub),
         (variable_cons_box_lb, variable_cons_box_ind, variable_cons_box_ub),
-        constraints
+        constraints,
     )
-
 end
 
 function build_model(pre_ocp::PreModel)::Model

src/state.jl

@@ -80,7 +80,8 @@ function state!(
     # checkings
     __is_state_set(ocp) && throw(CTBase.UnauthorizedCall("the state has already been set."))
 
-    (n > 0) && (size(components_names, 1) ≠ n) &&
+    (n > 0) &&
+        (size(components_names, 1) ≠ n) &&
         throw(
             CTBase.IncorrectArgument(
                 "the number of state names must be equal to the state dimension"

src/types.jl

@@ -206,7 +206,15 @@ $(TYPEDEF)
 
 $(TYPEDFIELDS)
 """
-struct ConstraintsModel{TP<:Tuple, TV1<:Tuple, TB<:Tuple, TS<:Tuple, TC<:Tuple, TV2<:Tuple, TC_ALL<:ConstraintsDictType} <: AbstractConstraintsModel
+struct ConstraintsModel{
+    TP<:Tuple,
+    TV1<:Tuple,
+    TB<:Tuple,
+    TS<:Tuple,
+    TC<:Tuple,
+    TV2<:Tuple,
+    TC_ALL<:ConstraintsDictType,
+} <: AbstractConstraintsModel
     path_nl::TP
     variable_nl::TV1
     boundary_nl::TB

src/variable.jl

@@ -48,7 +48,8 @@ function variable!(
     __is_variable_set(ocp) &&
         throw(CTBase.UnauthorizedCall("the variable has already been set."))
 
-    (q > 0) && (size(components_names, 1) ≠ q) &&
+    (q > 0) &&
+        (size(components_names, 1) ≠ q) &&
         throw(
             CTBase.IncorrectArgument(
                 "the number of variable names must be equal to the variable dimension"

test/test_constraints.jl

@@ -1,5 +1,4 @@
 function test_constraints()
-
     ∅ = Vector{Float64}()
 
     # From PreModel

test/test_ocp.jl

@@ -45,7 +45,9 @@ function test_ocp()
 
     # path constraint
     f_path_a(r, t, x, u, v) = r .= x .+ u .+ v .+ t
-    CTModels.__constraint!(pre_constraints, :path, n, m, q; f=f_path_a, lb=[0, 1], ub=[1, 2])
+    CTModels.__constraint!(
+        pre_constraints, :path, n, m, q; f=f_path_a, lb=[0, 1], ub=[1, 2]
+    )
     f_path_b(r, t, x, u, v) = r .= x[1] + u[1] + v[1] + t
     CTModels.__constraint!(pre_constraints, :path, n, m, q; f=f_path_b, lb=[3], ub=[3])
 
@@ -55,15 +57,19 @@ function test_ocp()
         pre_constraints, :boundary, n, m, q; f=f_boundary_a, lb=[0, 1], ub=[1, 2]
     )
     f_boundary_b(r, x0, xf, v) = r .= x0[1] - 1.0 + v[1] * (xf[1] - x0[1])
-    CTModels.__constraint!(pre_constraints, :boundary, n, m, q; f=f_boundary_b, lb=[3], ub=[3])
+    CTModels.__constraint!(
+        pre_constraints, :boundary, n, m, q; f=f_boundary_b, lb=[3], ub=[3]
+    )
 
     # variable constraint
     f_variable_a(r, v) = r .= 2v
     CTModels.__constraint!(
         pre_constraints, :variable, n, m, q; f=f_variable_a, lb=[0, 1], ub=[1, 2]
     )
     f_variable_b(r, v) = r .= v[1] - 1.0
-    CTModels.__constraint!(pre_constraints, :variable, n, m, q; f=f_variable_b, lb=[3], ub=[3])
+    CTModels.__constraint!(
+        pre_constraints, :variable, n, m, q; f=f_variable_b, lb=[3], ub=[3]
+    )
 
     # state box constraint
     CTModels.__constraint!(pre_constraints, :state, n, m, q; lb=[0, 1], ub=[1, 2])
@@ -156,11 +162,21 @@ function test_ocp()
     # Get all constraints and test. Be careful, the order is not guaranteed. 
     # We will check up to permutations by sorting the results.
     (path_cons_nl_lb, path_cons_nl!, path_cons_nl_ub) = CTModels.path_constraints_nl(ocp)
-    (variable_cons_nl_lb, variable_cons_nl!, variable_cons_nl_ub) = CTModels.variable_constraints_nl(ocp)
-    (boundary_cons_nl_lb, boundary_cons_nl!, boundary_cons_nl_ub) = CTModels.boundary_constraints_nl(ocp)
-    (state_cons_box_lb, state_cons_box_ind, state_cons_box_ub) = CTModels.state_constraints_box(ocp)
-    (control_cons_box_lb, control_cons_box_ind, control_cons_box_ub) = CTModels.control_constraints_box(ocp)
-    (variable_cons_box_lb, variable_cons_box_ind, variable_cons_box_ub) = CTModels.variable_constraints_box(ocp)
+    (variable_cons_nl_lb, variable_cons_nl!, variable_cons_nl_ub) = CTModels.variable_constraints_nl(
+        ocp
+    )
+    (boundary_cons_nl_lb, boundary_cons_nl!, boundary_cons_nl_ub) = CTModels.boundary_constraints_nl(
+        ocp
+    )
+    (state_cons_box_lb, state_cons_box_ind, state_cons_box_ub) = CTModels.state_constraints_box(
+        ocp
+    )
+    (control_cons_box_lb, control_cons_box_ind, control_cons_box_ub) = CTModels.control_constraints_box(
+        ocp
+    )
+    (variable_cons_box_lb, variable_cons_box_ind, variable_cons_box_ub) = CTModels.variable_constraints_box(
+        ocp
+    )
 
     # path constraints
     @test sort(path_cons_nl_lb) == [0, 1, 3]