Skip to content

Support SparseMatricesCOO.jl v0.2.4 #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 18, 2025
Merged

Support SparseMatricesCOO.jl v0.2.4 #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ NLPModelsModifiers = "0.7"
QPSReader = "0.2.1"
SolverCore = "0.3"
SparseArrays = "1.10"
SparseMatricesCOO = "0.2.3"
SparseMatricesCOO = "0.2.4"
julia = "1.10"
4 changes: 3 additions & 1 deletion src/presolve/presolve.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,9 @@ function presolve(

if !isempty(operations)
nconps, nvarps = update_vectors!(qmp)
remove_rowscols_A_H!(psdata.A, psdata.H, qmp, nvarps, nconps)
Anew, Hnew = remove_rowscols_A_H!(psdata.A, psdata.H, qmp, nvarps, nconps)
psdata.A = Anew
psdata.H = Hnew
psdata.c0 = qmp.c0
end

Expand Down
7 changes: 4 additions & 3 deletions src/presolve/presolve_utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ end
find_empty_rowscols(v_cnt::Vector{Int}) = findall(isequal(0), v_cnt)
find_singleton_rowscols(v_cnt::Vector{Int}) = findall(isequal(1), v_cnt)

function remove_rowscols_A_H!(A, H, qmp::QuadraticModelPresolveData, nvarps, nconps)
function remove_rowscols_A_H!(A::SparseMatrixCOO, H::SparseMatrixCOO, qmp::QuadraticModelPresolveData, nvarps, nconps)
Arows, Acols, Avals = A.rows, A.cols, A.vals
Hrows, Hcols, Hvals = H.rows, H.cols, H.vals
kept_rows, kept_cols = qmp.kept_rows, qmp.kept_cols
Expand Down Expand Up @@ -118,8 +118,9 @@ function remove_rowscols_A_H!(A, H, qmp::QuadraticModelPresolveData, nvarps, nco
resize!(Hcols, Hnnz)
resize!(Hvals, Hnnz)
end
A.m, A.n = nconps, nvarps
H.m, H.n = nvarps, nvarps
Anew = SparseMatrixCOO(nconps, nvarps, Arows, Acols, Avals)
Hnew = SparseMatrixCOO(nvarps, nvarps, Hrows, Hcols, Hvals)
return Anew, Hnew
end

function update_vectors!(qmp::QuadraticModelPresolveData)
Expand Down
Loading