Skip to content

Commit 54255c0

Browse files
authored
Merge pull request #148 from control-toolbox/auto-juliaformatter-pr
[AUTO] JuliaFormatter.jl run
2 parents e545e73 + 6f1df61 commit 54255c0

3 files changed

Lines changed: 4 additions & 11 deletions

File tree

src/model.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ model = build_constraints(constraints)
4949
```
5050
"""
5151
function build_constraints(constraints::ConstraintsDictType)::ConstraintsModel
52-
5352
LocalNumber = Float64
5453

5554
path_cons_nl_f = Vector{Function}() # nonlinear path constraints

src/types.jl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,9 +344,8 @@ $(TYPEDFIELDS)
344344
state::Union{AbstractStateModel,Nothing} = nothing
345345
control::Union{AbstractControlModel,Nothing} = nothing
346346
variable::AbstractVariableModel = EmptyVariableModel()
347-
dynamics::Union{
348-
Function,Vector{<:Tuple{<:AbstractRange{<:Int},<:Function}},Nothing
349-
} = nothing
347+
dynamics::Union{Function,Vector{<:Tuple{<:AbstractRange{<:Int},<:Function}},Nothing} =
348+
nothing
350349
objective::Union{AbstractObjectiveModel,Nothing} = nothing
351350
constraints::ConstraintsDictType = ConstraintsDictType()
352351
definition::Union{Expr,Nothing} = nothing

test/extras/dynamics.jl

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ partial_dyn_3!(r, t, x, u, v) = (@views r[1] .= x[1] + u[2])
77
x = [1, 2, 3]
88
u = [-1, 2]
99

10-
parts = [
11-
(1:1, partial_dyn_1!),
12-
(2:2, partial_dyn_2!),
13-
(3:3, partial_dyn_3!),
14-
]
10+
parts = [(1:1, partial_dyn_1!), (2:2, partial_dyn_2!), (3:3, partial_dyn_3!)]
1511

1612
dyn! = CTModels.__build_dynamics_from_parts(parts)
1713

@@ -24,6 +20,5 @@ r - [x[1] + 2u[2], 2x[3], x[1] + u[2]]
2420

2521
r[1:1] .= 0
2622

27-
2823
x = [1, 2, 3]
29-
x[1] = 10
24+
x[1] = 10

0 commit comments

Comments
 (0)