coo

Author: geoffroyleconte

Manifest.toml

@@ -0,0 +1,73 @@
+# This file is machine-generated - editing it directly is not advised
+
+[[ExprTools]]
+git-tree-sha1 = "b7e3d17636b348f005f11040025ae8c6f645fe92"
+uuid = "e2ba6199-217a-4e67-a87a-7c52f15ade04"
+version = "0.1.6"
+
+[[FastClosures]]
+git-tree-sha1 = "acebe244d53ee1b461970f8910c235b259e772ef"
+uuid = "9aa1b823-49e4-5ca5-8b0f-3971ec8bab6a"
+version = "0.3.2"
+
+[[Libdl]]
+uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+
+[[LinearAlgebra]]
+deps = ["Libdl"]
+uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+
+[[LinearOperators]]
+deps = ["FastClosures", "LinearAlgebra", "Printf", "SparseArrays", "TimerOutputs"]
+git-tree-sha1 = "b1c44338ae57f6e561b1df85240ced65404508a5"
+uuid = "5c8ed15e-5a4c-59e4-a42b-c7e8811fb125"
+version = "2.2.2"
+
+[[NLPModels]]
+deps = ["FastClosures", "LinearAlgebra", "LinearOperators", "Printf", "SparseArrays"]
+git-tree-sha1 = "e17945150641249d1658637e4faf71a049067d73"
+uuid = "a4795742-8479-5a88-8948-cc11e1c8c1a6"
+version = "0.17.2"
+
+[[NLPModelsModifiers]]
+deps = ["FastClosures", "LinearAlgebra", "LinearOperators", "NLPModels", "Printf", "SparseArrays"]
+git-tree-sha1 = "705d402d1fe1837f0c07dd1d7b137b390fb764c5"
+uuid = "e01155f1-5c6f-4375-a9d8-616dd036575f"
+version = "0.4.3"
+
+[[Printf]]
+deps = ["Unicode"]
+uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+
+[[Random]]
+deps = ["Serialization"]
+uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+
+[[Requires]]
+deps = ["UUIDs"]
+git-tree-sha1 = "4036a3bd08ac7e968e27c203d45f5fff15020621"
+uuid = "ae029012-a4dd-5104-9daa-d747884805df"
+version = "1.1.3"
+
+[[SHA]]
+uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
+
+[[Serialization]]
+uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
+
+[[SparseArrays]]
+deps = ["LinearAlgebra", "Random"]
+uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+
+[[TimerOutputs]]
+deps = ["ExprTools", "Printf"]
+git-tree-sha1 = "7cb456f358e8f9d102a8b25e8dfedf58fa5689bc"
+uuid = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
+version = "0.5.13"
+
+[[UUIDs]]
+deps = ["Random", "SHA"]
+uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
+
+[[Unicode]]
+uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"

Project.toml

@@ -10,6 +10,7 @@ NLPModels = "a4795742-8479-5a88-8948-cc11e1c8c1a6"
 NLPModelsModifiers = "e01155f1-5c6f-4375-a9d8-616dd036575f"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+SparseMatricesCOO = "fa32481b-f100-4b48-8dc8-c62f61b13870"
 
 [compat]
 LinearOperators = "2.2.2"

src/QuadraticModels.jl

@@ -4,7 +4,7 @@ module QuadraticModels
 using LinearAlgebra, SparseArrays
 
 # our packages
-using LinearOperators, NLPModels, NLPModelsModifiers
+using LinearOperators, NLPModels, NLPModelsModifiers, SparseMatricesCOO
 
 # auxiliary packages
 using Requires

src/presolve/presolve.jl

@@ -1,10 +1,9 @@
 include("remove_ifix.jl")
 
-mutable struct PresolvedQuadraticModel{T, S, D <: AbstractQPData{T, S}} <:
-               AbstractQuadraticModel{T, S}
+mutable struct PresolvedQuadraticModel{T, S, M1, M2} <: AbstractQuadraticModel{T, S}
   meta::NLPModelMeta{T, S}
   counters::Counters
-  data::D
+  data::QPData{T, S, M1, M2}
   xrm::S
 end
 
@@ -17,7 +16,7 @@ The presolve operations currently implemented are:
 - [`remove_ifix!`](@ref)
 
 """
-function presolve(qm::QuadraticModel{T, S}; kwargs...) where {T <: Real, S}
+function presolve(qm::QuadraticModel{T, S, M1, M2}; kwargs...) where {T <: Real, S, M1 <: SparseMatrixCOO, M2 <: SparseMatrixCOO}
   psqm = deepcopy(qm)
   psdata = psqm.data
   lvar, uvar = psqm.meta.lvar, psqm.meta.uvar
@@ -28,13 +27,13 @@ function presolve(qm::QuadraticModel{T, S}; kwargs...) where {T <: Real, S}
   if length(ifix) > 0
     xrm, psdata.c0, nvarps = remove_ifix!(
       ifix,
-      psdata.Hrows,
-      psdata.Hcols,
-      psdata.Hvals,
+      psdata.H.rows,
+      psdata.H.cols,
+      psdata.H.vals,
       nvar,
-      psdata.Arows,
-      psdata.Acols,
-      psdata.Avals,
+      psdata.A.rows,
+      psdata.A.cols,
+      psdata.A.vals,
       psdata.c,
       psdata.c0,
       lvar,
@@ -48,12 +47,12 @@ function presolve(qm::QuadraticModel{T, S}; kwargs...) where {T <: Real, S}
   end
 
   # form meta
-  nnzh = length(psdata.Hvals)
-  if !(nnzh == length(psdata.Hrows) == length(psdata.Hcols))
+  nnzh = length(psdata.H.vals)
+  if !(nnzh == length(psdata.H.rows) == length(psdata.H.cols))
     error("The length of Hrows, Hcols and Hvals must be the same")
   end
-  nnzj = length(psdata.Avals)
-  if !(nnzj == length(psdata.Arows) == length(psdata.Acols))
+  nnzj = length(psdata.A.vals)
+  if !(nnzj == length(psdata.A.rows) == length(psdata.A.cols))
     error("The length of Arows, Acols and Avals must be the same")
   end
   psmeta = NLPModelMeta{T, S}(