fix allocations in lnk+csc, type annotate op

Author: j-fu

src/genericextendablesparsematrixcsc.jl

@@ -137,12 +137,12 @@ end
 """
 function rawupdateindex!(
         ext::GenericExtendableSparseMatrixCSC,
-        op,
+        op::Op,
         v,
         i,
         j,
         part = 1
-    )
+    ) where {Op}
     k = findindex(ext.cscmatrix, i, j)
     return if k > 0
         ext.cscmatrix.nzval[k] = op(ext.cscmatrix.nzval[k], v)
@@ -151,16 +151,17 @@ function rawupdateindex!(
     end
 end
 
+
 """
     $(TYPEDSIGNATURES)
 """
 function updateindex!(
         ext::GenericExtendableSparseMatrixCSC,
-        op,
+        op::Op,
         v,
         i,
         j
-    )
+    ) where {Op}
     k = findindex(ext.cscmatrix, i, j)
     return if k > 0
         ext.cscmatrix.nzval[k] = op(ext.cscmatrix.nzval[k], v)

src/genericmtextendablesparsematrixcsc.jl

@@ -148,12 +148,12 @@ nnznew(ext::GenericMTExtendableSparseMatrixCSC) = sum(nnz, ext.xmatrices)
 """
 function rawupdateindex!(
         ext::GenericMTExtendableSparseMatrixCSC,
-        op,
+        op::Op,
         v,
         i,
         j,
         tid = 1
-    )
+    ) where {Op}
     k = findindex(ext.cscmatrix, i, j)
     return if k > 0
         ext.cscmatrix.nzval[k] = op(ext.cscmatrix.nzval[k], v)
@@ -168,12 +168,12 @@ end
 """
 function updateindex!(
         ext::GenericMTExtendableSparseMatrixCSC,
-        op,
+        op::Op,
         v,
         i,
         j,
         tid = 1
-    )
+    ) where {Op}
     k = findindex(ext.cscmatrix, i, j)
     return if k > 0
         ext.cscmatrix.nzval[k] = op(ext.cscmatrix.nzval[k], v)

src/sparsematrixcsc.jl

@@ -48,7 +48,7 @@ A
 ```
 
 """
-function updateindex!(csc::SparseMatrixCSC{Tv, Ti}, op, v, i, j) where {Tv, Ti <: Integer}
+function updateindex!(csc::SparseMatrixCSC{Tv, Ti}, op::Op, v, i, j) where {Tv, Ti <: Integer, Op}
     k = findindex(csc, i, j)
     if k > 0 # update existing value
         csc.nzval[k] = op(csc.nzval[k], v)

src/sparsematrixdict.jl

@@ -85,7 +85,7 @@ end
 """
     $(TYPEDSIGNATURES)
 """
-function rawupdateindex!(m::SparseMatrixDict{Tv, Ti}, op, v, i, j) where {Tv, Ti}
+function rawupdateindex!(m::SparseMatrixDict{Tv, Ti}, op::Op, v, i, j) where {Tv, Ti, Op}
     p = Pair(i, j)
     return m.values[p] = op(get(m.values, p, zero(Tv)), v)
 end
@@ -94,7 +94,7 @@ end
 """
     $(TYPEDSIGNATURES)
 """
-function updateindex!(m::SparseMatrixDict{Tv, Ti}, op, v, i, j) where {Tv, Ti}
+function updateindex!(m::SparseMatrixDict{Tv, Ti}, op::Op, v, i, j) where {Tv, Ti, Op}
     p = Pair(i, j)
     v1 = op(get(m.values, p, zero(Tv)), v)
     if !iszero(v1)

src/sparsematrixdilnkc.jl

@@ -218,7 +218,7 @@ Update element of the matrix  with operation `op`.
 It assumes that `op(0,0)==0`. If `v` is zero, no new 
 entry is created.
 """
-function updateindex!(lnk::SparseMatrixDILNKC{Tv, Ti}, op, v, i, j) where {Tv, Ti}
+function updateindex!(lnk::SparseMatrixDILNKC{Tv, Ti}, op::Op, v, i, j) where {Tv, Ti, Op}
     k, k0 = findindex(lnk, i, j)
     if k > 0
         lnk.nzval[k] = op(lnk.nzval[k], v)
@@ -238,7 +238,7 @@ Update element of the matrix  with operation `op`.
 It assumes that `op(0,0)==0`. If `v` is zero a new entry
 is created nevertheless.
 """
-function rawupdateindex!(lnk::SparseMatrixDILNKC{Tv, Ti}, op, v, i, j) where {Tv, Ti}
+function rawupdateindex!(lnk::SparseMatrixDILNKC{Tv, Ti}, op::Op, v, i, j) where {Tv, Ti, Op}
     k, k0 = findindex(lnk, i, j)
     if k > 0
         lnk.nzval[k] = op(lnk.nzval[k], v)

src/sparsematrixlnk.jl

@@ -216,7 +216,7 @@ Update element of the matrix  with operation `op`.
 It assumes that `op(0,0)==0`. If `v` is zero, no new 
 entry is created.
 """
-function updateindex!(lnk::SparseMatrixLNK{Tv, Ti}, op, v, i, j) where {Tv, Ti}
+function updateindex!(lnk::SparseMatrixLNK{Tv, Ti}, op::Op, v, i, j) where {Tv, Ti, Op}
     # Set the first  column entry if it was not yet set.
     if lnk.rowval[j] == 0 && !iszero(v)
         lnk.rowval[j] = i
@@ -243,7 +243,7 @@ Update element of the matrix  with operation `op`.
 It assumes that `op(0,0)==0`. If `v` is zero a new entry
 is created nevertheless.
 """
-function rawupdateindex!(lnk::SparseMatrixLNK{Tv, Ti}, op, v, i, j) where {Tv, Ti}
+function rawupdateindex!(lnk::SparseMatrixLNK{Tv, Ti}, op::Op, v, i, j) where {Tv, Ti, Op}
     # Set the first  column entry if it was not yet set.
     if lnk.rowval[j] == 0
         lnk.rowval[j] = i
@@ -278,13 +278,13 @@ SparseArrays.nnz(lnk::SparseMatrixLNK) = lnk.nnz
 
 # Struct holding pair of value and row
 # number, for sorting
-mutable struct ColEntry{Tv, Ti <: Integer}
+struct ColEntry{Tv, Ti <: Integer}
     rowval::Ti
     nzval::Tv
 end
 
 # Comparison method for sorting
-Base.isless(x::ColEntry, y::ColEntry) = (x.rowval < y.rowval)
+Base.isless(x::ColEntry{Tv, Ti}, y::ColEntry{Tv, Ti}) where {Tv, Ti} = (x.rowval < y.rowval)
 
 """
 $(TYPEDSIGNATURES)