Skip to content

Commit cc8d8a1

Browse files
committed
🤖 Format .jl files
1 parent 4c7029e commit cc8d8a1

File tree

2 files changed

+29
-5
lines changed

2 files changed

+29
-5
lines changed

src/moi_nlp_model.jl

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ function NLPModels.cons!(nlp::MathOptNLPModel, x::AbstractVector, c::AbstractVec
134134
if nlp.quadcon.nquad > 0
135135
for i = 1:(nlp.quadcon.nquad)
136136
qcon = nlp.quadcon.constraints[i]
137-
c[nlp.meta.nlin + i] = 0.5 * coo_sym_dot(qcon.A.rows, qcon.A.cols, qcon.A.vals, x, x) + dot(qcon.b, x)
137+
c[nlp.meta.nlin + i] =
138+
0.5 * coo_sym_dot(qcon.A.rows, qcon.A.cols, qcon.A.vals, x, x) + dot(qcon.b, x)
138139
end
139140
end
140141
if nlp.meta.nnln > nlp.quadcon.nquad
@@ -339,13 +340,22 @@ function NLPModels.jprod!(
339340
if nlp.meta.nlin > 0
340341
view(Jv, nlp.meta.lin) .= 0.0
341342
transpose = false
342-
coo_unsym_add_mul!(transpose, nlp.lincon.jacobian.rows, nlp.lincon.jacobian.cols, nlp.lincon.jacobian.vals, v, Jv, 1.0)
343+
coo_unsym_add_mul!(
344+
transpose,
345+
nlp.lincon.jacobian.rows,
346+
nlp.lincon.jacobian.cols,
347+
nlp.lincon.jacobian.vals,
348+
v,
349+
Jv,
350+
1.0,
351+
)
343352
end
344353
if nlp.quadcon.nquad > 0
345354
for i = 1:(nlp.quadcon.nquad)
346355
# Jv[i] = (Aᵢ * x + bᵢ)ᵀ * v
347356
qcon = nlp.quadcon.constraints[i]
348-
Jv[nlp.meta.nlin + i] = coo_sym_dot(qcon.A.rows, qcon.A.cols, qcon.A.vals, x, v) + dot(qcon.b, v)
357+
Jv[nlp.meta.nlin + i] =
358+
coo_sym_dot(qcon.A.rows, qcon.A.cols, qcon.A.vals, x, v) + dot(qcon.b, v)
349359
end
350360
end
351361
if nlp.meta.nnln > nlp.quadcon.nquad
@@ -410,7 +420,15 @@ function NLPModels.jtprod!(
410420
(nlp.quadcon.nquad == nlp.meta.nnln) && (Jtv .= 0.0)
411421
if nlp.meta.nlin > 0
412422
transpose = true
413-
coo_unsym_add_mul!(transpose, nlp.lincon.jacobian.rows, nlp.lincon.jacobian.cols, nlp.lincon.jacobian.vals, v, Jtv, 1.0)
423+
coo_unsym_add_mul!(
424+
transpose,
425+
nlp.lincon.jacobian.rows,
426+
nlp.lincon.jacobian.cols,
427+
nlp.lincon.jacobian.vals,
428+
v,
429+
Jtv,
430+
1.0,
431+
)
414432
end
415433
if nlp.quadcon.nquad > 0
416434
for i = 1:(nlp.quadcon.nquad)

test/nlp_consistency.jl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@ for problem in nlp_problems
44
problem_f = eval(Symbol(lowercase(problem)))
55
nlp_moi = MathOptNLPModel(problem_f())
66
nlps = [nlp_manual; nlp_moi]
7-
consistent_nlps(nlps, linear_api = true, test_slack = false, test_counters = false, exclude = [])
7+
consistent_nlps(
8+
nlps,
9+
linear_api = true,
10+
test_slack = false,
11+
test_counters = false,
12+
exclude = [],
13+
)
814
coord_memory_nlp(nlp_moi, linear_api = true)
915
view_subarray_nlp(nlp_moi)
1016
end

0 commit comments

Comments
 (0)