Skip to content

Commit e165a0e

Browse files
committed
Fix format
1 parent c7345b0 commit e165a0e

1 file changed

Lines changed: 74 additions & 19 deletions

File tree

src/MOI_Nonlinear_fork.jl

Lines changed: 74 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,10 @@ end
77

88
function Model()
99
model = MOI.Nonlinear.Model()
10-
append!(model.operators.multivariate_operators, [
11-
:vect,
12-
:dot,
13-
:hcat,
14-
:vcat,
15-
:norm,
16-
:sum,
17-
:row,
18-
])
10+
append!(
11+
model.operators.multivariate_operators,
12+
[:vect, :dot, :hcat, :vcat, :norm, :sum, :row],
13+
)
1914
return model
2015
end
2116

@@ -25,7 +20,9 @@ function parse_expression(data::MOI.Nonlinear.Model, input)
2520
return expr
2621
end
2722

28-
parse_expression(data, expr, item, parent) = MOI.Nonlinear.parse_expression(data, expr, item, parent)
23+
function parse_expression(data, expr, item, parent)
24+
return MOI.Nonlinear.parse_expression(data, expr, item, parent)
25+
end
2926

3027
function parse_expression(
3128
data::MOI.Nonlinear.Model,
@@ -49,19 +46,49 @@ end
4946
function _parse_expression(stack, data, expr, x, parent_index)
5047
if Meta.isexpr(x, :call)
5148
if length(x.args) == 2 && !Meta.isexpr(x.args[2], :...)
52-
MOI.Nonlinear._parse_univariate_expression(stack, data, expr, x, parent_index)
49+
MOI.Nonlinear._parse_univariate_expression(
50+
stack,
51+
data,
52+
expr,
53+
x,
54+
parent_index,
55+
)
5356
else
5457
# The call is either n-ary, or it is a splat, in which case we
5558
# cannot tell just yet whether the expression is unary or nary.
5659
# Punt to multivariate and try to recover later.
57-
MOI.Nonlinear._parse_multivariate_expression(stack, data, expr, x, parent_index)
60+
MOI.Nonlinear._parse_multivariate_expression(
61+
stack,
62+
data,
63+
expr,
64+
x,
65+
parent_index,
66+
)
5867
end
5968
elseif Meta.isexpr(x, :comparison)
60-
MOI.Nonlinear._parse_comparison_expression(stack, data, expr, x, parent_index)
69+
MOI.Nonlinear._parse_comparison_expression(
70+
stack,
71+
data,
72+
expr,
73+
x,
74+
parent_index,
75+
)
6176
elseif Meta.isexpr(x, :...)
62-
MOI.Nonlinear._parse_splat_expression(stack, data, expr, x, parent_index)
77+
MOI.Nonlinear._parse_splat_expression(
78+
stack,
79+
data,
80+
expr,
81+
x,
82+
parent_index,
83+
)
6384
elseif Meta.isexpr(x, :&&) || Meta.isexpr(x, :||)
64-
MOI.Nonlinear._parse_logic_expression(stack, data, expr, x, parent_index)
85+
MOI.Nonlinear._parse_logic_expression(
86+
stack,
87+
data,
88+
expr,
89+
x,
90+
parent_index,
91+
)
6592
elseif Meta.isexpr(x, :vect)
6693
_parse_vect_expression(stack, data, expr, x, parent_index)
6794
elseif Meta.isexpr(x, :hcat)
@@ -126,7 +153,14 @@ function _parse_vect_expression(
126153
)
127154
@assert Meta.isexpr(x, :vect)
128155
id = get(data.operators.multivariate_operator_to_id, :vect, nothing)
129-
push!(expr.nodes, MOI.Nonlinear.Node(MOI.Nonlinear.NODE_CALL_MULTIVARIATE, id, parent_index))
156+
push!(
157+
expr.nodes,
158+
MOI.Nonlinear.Node(
159+
MOI.Nonlinear.NODE_CALL_MULTIVARIATE,
160+
id,
161+
parent_index,
162+
),
163+
)
130164
for i in length(x.args):-1:1
131165
push!(stack, (length(expr.nodes), x.args[i]))
132166
end
@@ -142,7 +176,14 @@ function _parse_row_expression(
142176
)
143177
@assert Meta.isexpr(x, :row)
144178
id = get(data.operators.multivariate_operator_to_id, :row, nothing)
145-
push!(expr.nodes, MOI.Nonlinear.Node(MOI.Nonlinear.NODE_CALL_MULTIVARIATE, id, parent_index))
179+
push!(
180+
expr.nodes,
181+
MOI.Nonlinear.Node(
182+
MOI.Nonlinear.NODE_CALL_MULTIVARIATE,
183+
id,
184+
parent_index,
185+
),
186+
)
146187
for i in length(x.args):-1:1
147188
push!(stack, (length(expr.nodes), x.args[i]))
148189
end
@@ -158,7 +199,14 @@ function _parse_hcat_expression(
158199
)
159200
@assert Meta.isexpr(x, :hcat)
160201
id = get(data.operators.multivariate_operator_to_id, :hcat, nothing)
161-
push!(expr.nodes, MOI.Nonlinear.Node(MOI.Nonlinear.NODE_CALL_MULTIVARIATE, id, parent_index))
202+
push!(
203+
expr.nodes,
204+
MOI.Nonlinear.Node(
205+
MOI.Nonlinear.NODE_CALL_MULTIVARIATE,
206+
id,
207+
parent_index,
208+
),
209+
)
162210
for i in length(x.args):-1:1
163211
push!(stack, (length(expr.nodes), x.args[i]))
164212
end
@@ -174,7 +222,14 @@ function _parse_vcat_expression(
174222
)
175223
@assert Meta.isexpr(x, :vcat)
176224
id = get(data.operators.multivariate_operator_to_id, :vcat, nothing)
177-
push!(expr.nodes, MOI.Nonlinear.Node(MOI.Nonlinear.NODE_CALL_MULTIVARIATE, id, parent_index))
225+
push!(
226+
expr.nodes,
227+
MOI.Nonlinear.Node(
228+
MOI.Nonlinear.NODE_CALL_MULTIVARIATE,
229+
id,
230+
parent_index,
231+
),
232+
)
178233
for i in length(x.args):-1:1
179234
push!(stack, (length(expr.nodes), x.args[i]))
180235
end

0 commit comments

Comments
 (0)