Skip to content

Commit e8725f9

Browse files
committed
Support SparseMatricesCOO.jl v0.2.4
1 parent d4f77c5 commit e8725f9

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ NLPModelsModifiers = "0.7"
2525
QPSReader = "0.2.1"
2626
SolverCore = "0.3"
2727
SparseArrays = "1.10"
28-
SparseMatricesCOO = "0.2.3"
28+
SparseMatricesCOO = "0.2.4"
2929
julia = "1.10"

src/presolve/presolve.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,9 @@ function presolve(
287287

288288
if !isempty(operations)
289289
nconps, nvarps = update_vectors!(qmp)
290-
remove_rowscols_A_H!(psdata.A, psdata.H, qmp, nvarps, nconps)
290+
Anew, Hnew = remove_rowscols_A_H!(psdata.A, psdata.H, qmp, nvarps, nconps)
291+
psdata.A = Anew
292+
psdata.H = Hnew
291293
psdata.c0 = qmp.c0
292294
end
293295

src/presolve/presolve_utils.jl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ end
5454
find_empty_rowscols(v_cnt::Vector{Int}) = findall(isequal(0), v_cnt)
5555
find_singleton_rowscols(v_cnt::Vector{Int}) = findall(isequal(1), v_cnt)
5656

57-
function remove_rowscols_A_H!(A, H, qmp::QuadraticModelPresolveData, nvarps, nconps)
57+
function remove_rowscols_A_H!(A::SparseMatrixCOO, H::SparseMatrixCOO, qmp::QuadraticModelPresolveData, nvarps, nconps)
5858
Arows, Acols, Avals = A.rows, A.cols, A.vals
5959
Hrows, Hcols, Hvals = H.rows, H.cols, H.vals
6060
kept_rows, kept_cols = qmp.kept_rows, qmp.kept_cols
@@ -118,8 +118,9 @@ function remove_rowscols_A_H!(A, H, qmp::QuadraticModelPresolveData, nvarps, nco
118118
resize!(Hcols, Hnnz)
119119
resize!(Hvals, Hnnz)
120120
end
121-
A.m, A.n = nconps, nvarps
122-
H.m, H.n = nvarps, nvarps
121+
Anew = SparseMatrixCOO(nconps, nvarps, Arows, Acols, Avals)
122+
Hnew = SparseMatrixCOO(nvarps, nvarps, Hrows, Hcols, Hvals)
123+
return Anew, Hnew
123124
end
124125

125126
function update_vectors!(qmp::QuadraticModelPresolveData)

0 commit comments

Comments
 (0)