Skip to content

Commit 706a26d

Browse files
authoredAug 31, 2024
Merge pull request #277 from control-toolbox/auto-juliaformatter-pr
[AUTO] JuliaFormatter.jl run
2 parents a71c657 + 309141d commit 706a26d

File tree

4 files changed

+300
-55
lines changed

4 files changed

+300
-55
lines changed
 

‎src/CTBase.jl

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,14 @@ export OptimalControlModel
258258
export Model
259259
export __OCPModel # redirection to Model to avoid confusion with other Model functions from other packages. Due to @def macro
260260
export variable!,
261-
time!, constraint!, dynamics!, objective!, state!, control!, remove_constraint!, model_expression!
261+
time!,
262+
constraint!,
263+
dynamics!,
264+
objective!,
265+
state!,
266+
control!,
267+
remove_constraint!,
268+
model_expression!
262269
export is_autonomous, is_fixed, is_time_independent, is_time_dependent, is_min, is_max
263270
export is_variable_dependent, is_variable_independent
264271
export nlp_constraints!, constraints, constraints_labels, constraint

‎src/optimal_control_model-setters.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ $(TYPEDSIGNATURES)
1111
Set the model expression of the optimal control problem or `nothing`.
1212
1313
"""
14-
model_expression!(ocp::OptimalControlModel, model_expression::Expr) = (ocp.model_expression = model_expression; nothing)
14+
model_expression!(ocp::OptimalControlModel, model_expression::Expr) =
15+
(ocp.model_expression = model_expression; nothing)
1516

1617
"""
1718
$(TYPEDSIGNATURES)

‎src/optimal_control_solution-setters.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ function OptimalControlSolution(
100100
state::Function,
101101
control::Function,
102102
objective::ctNumber,
103-
variable::Union{Nothing, Variable}=nothing,
103+
variable::Union{Nothing, Variable} = nothing,
104104
costate::Union{Nothing, Function} = nothing,
105105
time_grid::Union{Nothing, TimesDisc} = nothing,
106106
iterations::Union{Nothing, Integer} = nothing,
@@ -110,10 +110,10 @@ function OptimalControlSolution(
110110
infos::Dict{Symbol, Any} = Dict{Symbol, Any}(),
111111
boundary_constraints::Union{Nothing, ctVector} = nothing,
112112
mult_boundary_constraints::Union{Nothing, ctVector} = nothing,
113-
variable_constraints::Union{Nothing, ctVector}=nothing,
114-
mult_variable_constraints::Union{Nothing, ctVector}=nothing,
115-
mult_variable_box_lower::Union{Nothing, ctVector}=nothing,
116-
mult_variable_box_upper::Union{Nothing, ctVector}=nothing,
113+
variable_constraints::Union{Nothing, ctVector} = nothing,
114+
mult_variable_constraints::Union{Nothing, ctVector} = nothing,
115+
mult_variable_box_lower::Union{Nothing, ctVector} = nothing,
116+
mult_variable_box_upper::Union{Nothing, ctVector} = nothing,
117117
control_constraints::Union{Nothing, Function} = nothing,
118118
mult_control_constraints::Union{Nothing, Function} = nothing,
119119
state_constraints::Union{Nothing, Function} = nothing,
@@ -132,7 +132,7 @@ function OptimalControlSolution(
132132
objective = objective,
133133
costate = costate,
134134
time_grid = time_grid,
135-
variable=variable,
135+
variable = variable,
136136
iterations = iterations,
137137
stopping = stopping,
138138
message = message,

0 commit comments

Comments
 (0)