Skip to content

Commit 36f012b

Browse files
authored
Fix tests (#3)
* Fix tests * fix format * Fix format * Fix format * Fix format * Fixes * Fix * Fix * Fix
1 parent 7c615a4 commit 36f012b

9 files changed

Lines changed: 273 additions & 111 deletions

File tree

examples/quadrotor.jl

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ N = 3
77

88
n = 9
99
p = 4
10-
d(i, j, N) =
11-
(j == 1 ? 1 * sin(2 * pi / N * i) : 0.0) +
12-
(j == 3 ? 2 * sin(4 * pi / N * i) : 0.0) +
13-
(j == 5 ? 2 * i / N : 0.0)
10+
function d(i, j, N)
11+
return (j == 1 ? 1 * sin(2 * pi / N * i) : 0.0) +
12+
(j == 3 ? 2 * sin(4 * pi / N * i) : 0.0) +
13+
(j == 5 ? 2 * i / N : 0.0)
14+
end
1415
dt = 1/N
1516
R = fill(1 / 10, 4)
1617
Q = [1, 0, 1, 0, 1, 0, 1, 1, 1]
@@ -27,12 +28,7 @@ model = Model()
2728
using GenOpt
2829
container = ParametrizedArray
2930

30-
@constraint(
31-
model,
32-
[i in 1:n],
33-
x[1, i] == x0[i],
34-
container = container,
35-
)
31+
@constraint(model, [i in 1:n], x[1, i] == x0[i], container = container,)
3632
@constraint(
3733
model,
3834
[i in 1:N],
@@ -84,13 +80,17 @@ container = ParametrizedArray
8480
[i in 1:N],
8581
x[i+1, 7] ==
8682
x[i, 7] +
87-
(u[i, 2] * cos(x[i, 7]) / cos(x[i, 8]) + u[i, 3] * sin(x[i, 7]) / cos(x[i, 8])) * dt,
83+
(
84+
u[i, 2] * cos(x[i, 7]) / cos(x[i, 8]) +
85+
u[i, 3] * sin(x[i, 7]) / cos(x[i, 8])
86+
) * dt,
8887
container = container,
8988
)
9089
@constraint(
9190
model,
9291
[i in 1:N],
93-
x[i+1, 8] == x[i, 8] + (-u[i, 2] * sin(x[i, 7]) + u[i, 3] * cos(x[i, 7])) * dt,
92+
x[i+1, 8] ==
93+
x[i, 8] + (-u[i, 2] * sin(x[i, 7]) + u[i, 3] * cos(x[i, 7])) * dt,
9494
container = container,
9595
)
9696
@constraint(

src/JuMP_wrapper.jl

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,26 @@ end
3535

3636
Base.size(array::ArrayOfVariables) = array.size
3737
function Base.getindex(A::ArrayOfVariables{T}, I...) where {T}
38-
index = A.offset + Base._to_linear_index(Base.CartesianIndices(A.size), I...)
38+
index =
39+
A.offset + Base._to_linear_index(Base.CartesianIndices(A.size), I...)
3940
return JuMP.GenericVariableRef{T}(A.model, MOI.VariableIndex(index))
4041
end
4142

4243
JuMP._is_real(::ArrayOfVariables) = true
43-
JuMP.moi_function(array::ArrayOfVariables) = ContiguousArrayOfVariables(array.offset, array.size)
44-
function JuMP.jump_function(model::JuMP.GenericModel{T}, array::ContiguousArrayOfVariables{N}) where {T,N}
44+
function JuMP.moi_function(array::ArrayOfVariables)
45+
return ContiguousArrayOfVariables(array.offset, array.size)
46+
end
47+
function JuMP.jump_function(
48+
model::JuMP.GenericModel{T},
49+
array::ContiguousArrayOfVariables{N},
50+
) where {T,N}
4551
return ArrayOfVariables{T,N}(model, array.offset, array.size)
4652
end
4753

48-
function Base.convert(::Type{ArrayOfVariables{T,N}}, array::Array{JuMP.GenericVariableRef{T},N}) where {T,N}
54+
function Base.convert(
55+
::Type{ArrayOfVariables{T,N}},
56+
array::Array{JuMP.GenericVariableRef{T},N},
57+
) where {T,N}
4958
model = JuMP.owner_model(array[1])
5059
offset = JuMP.index(array[1]).value - 1
5160
for i in eachindex(array)
@@ -106,7 +115,8 @@ end
106115

107116
function Base.getindex(expr::ExprGenerator, i::Integer)
108117
idx = CartesianIndices(Base.OneTo.(_size(expr)))[i]
109-
values = [expr.iterators[i].values[idx[i]] for i in eachindex(expr.iterators)]
118+
values =
119+
[expr.iterators[i].values[idx[i]] for i in eachindex(expr.iterators)]
110120
return index_iterators(expr.expr.expr, values)
111121
end
112122

src/MOI_wrapper.jl

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ end
4141
function MOI.Utilities.is_canonical(f::FunctionGenerator)
4242
return MOI.Utilities.is_canonical(f.func)
4343
end
44-
function MOI.Utilities.is_coefficient_type(::Type{FunctionGenerator{E}}, ::Type{T}) where {E,T}
44+
function MOI.Utilities.is_coefficient_type(
45+
::Type{FunctionGenerator{E}},
46+
::Type{T},
47+
) where {E,T}
4548
return MOI.Utilities.is_coefficient_type(E, T)
4649
end
4750

@@ -54,12 +57,18 @@ function Base.copy(f::SumGenerator{F}) where {F}
5457
return SumGenerator{F}(copy(f.func), f.iterators)
5558
end
5659

57-
function MOI.Utilities.map_indices(::MOI.Utilities.IndexMap, func::Union{FunctionGenerator,SumGenerator})
60+
function MOI.Utilities.map_indices(
61+
::MOI.Utilities.IndexMap,
62+
func::Union{FunctionGenerator,SumGenerator},
63+
)
5864
# TODO check it's identity
5965
return func
6066
end
6167

62-
function MOI.Utilities.map_indices(::Function, func::Union{FunctionGenerator,SumGenerator})
68+
function MOI.Utilities.map_indices(
69+
::Function,
70+
func::Union{FunctionGenerator,SumGenerator},
71+
)
6372
# TODO check it's identity
6473
return func
6574
end

0 commit comments

Comments
 (0)