Skip to content

Commit 34526c6

Browse files
🤖 Format .jl files
1 parent 356a0c6 commit 34526c6

File tree

2 files changed

+28
-5
lines changed

2 files changed

+28
-5
lines changed

src/presolve/presolve.jl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ The presolve operations currently implemented are:
1616
- [`remove_ifix!`](@ref)
1717
1818
"""
19-
function presolve(qm::QuadraticModel{T, S, M1, M2}; kwargs...) where {T <: Real, S, M1 <: SparseMatrixCOO, M2 <: SparseMatrixCOO}
19+
function presolve(
20+
qm::QuadraticModel{T, S, M1, M2};
21+
kwargs...,
22+
) where {T <: Real, S, M1 <: SparseMatrixCOO, M2 <: SparseMatrixCOO}
2023
psqm = deepcopy(qm)
2124
psdata = psqm.data
2225
lvar, uvar = psqm.meta.lvar, psqm.meta.uvar

src/qpmodel.jl

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,12 @@ function get_QPDataCOO(c0::T, c::S, H::SparseMatrixCSC{T}, A::AbstractMatrix{T})
2626
I = ((i, j, A[i, j]) for i = 1:ncon, j = 1:nvar)
2727
nvar * ncon, getindex.(I, 1)[:], getindex.(I, 2)[:], getindex.(I, 3)[:]
2828
end
29-
data = QPData(c0, c, SparseMatrixCOO(nvar, nvar, Hrows, Hcols, Hvals), SparseMatrixCOO(ncon, nvar, Arows, Acols, Avals))
29+
data = QPData(
30+
c0,
31+
c,
32+
SparseMatrixCOO(nvar, nvar, Hrows, Hcols, Hvals),
33+
SparseMatrixCOO(ncon, nvar, Arows, Acols, Avals),
34+
)
3035
return data, nnzh, nnzj
3136
end
3237

@@ -130,7 +135,12 @@ function QuadraticModel(
130135
kwargs...,
131136
),
132137
Counters(),
133-
QPData(c0, c, SparseMatrixCOO(nvar, nvar, Hrows, Hcols, Hvals), SparseMatrixCOO(ncon, nvar, Arows, Acols, Avals)),
138+
QPData(
139+
c0,
140+
c,
141+
SparseMatrixCOO(nvar, nvar, Hrows, Hcols, Hvals),
142+
SparseMatrixCOO(ncon, nvar, Arows, Acols, Avals),
143+
),
134144
)
135145
end
136146

@@ -399,12 +409,22 @@ function SlackModel!(qp::QuadraticModel{T, S, M1, M2}) where {T, S, M1, M2 <: Sp
399409
return qp
400410
end
401411

402-
function slackdata(data::QPData{T, S, M1, M2}, meta::NLPModelMeta{T}, ns::Int) where {T, S, M1 <: SparseMatrixCOO, M2 <: SparseMatrixCOO}
412+
function slackdata(
413+
data::QPData{T, S, M1, M2},
414+
meta::NLPModelMeta{T},
415+
ns::Int,
416+
) where {T, S, M1 <: SparseMatrixCOO, M2 <: SparseMatrixCOO}
403417
nvar_slack = meta.nvar + ns
404418
return QPData(
405419
copy(data.c0),
406420
[data.c; fill!(similar(data.c, ns), zero(T))],
407-
SparseMatrixCOO(nvar_slack, nvar_slack, copy(data.H.rows), copy(data.H.cols), copy(data.H.vals)),
421+
SparseMatrixCOO(
422+
nvar_slack,
423+
nvar_slack,
424+
copy(data.H.rows),
425+
copy(data.H.cols),
426+
copy(data.H.vals),
427+
),
408428
SparseMatrixCOO(
409429
meta.ncon,
410430
nvar_slack,

0 commit comments

Comments
 (0)