Algebraic operators for SparseMatrixCSCView

JuliaSparse · Oct 13, 2023 · c093c1b · c093c1b
1 parent 0f8bbda
commit c093c1b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/higherorderfns.jl b/src/higherorderfns.jl
@@ -8,7 +8,7 @@ import Base: map, map!, broadcast, copy, copyto!
 
 using Base: front, tail, to_shape
 
-using ..SparseArrays: SparseVector, SparseMatrixCSC, FixedSparseCSC,
+using ..SparseArrays: SparseVector, SparseMatrixCSC, FixedSparseCSC, SparseMatrixCSCView,
                       AbstractCompressedVector, AbstractSparseVector, AbstractSparseMatrixCSC,
                       AbstractSparseMatrix, AbstractSparseArray,
                       SparseVectorUnion, AdjOrTransSparseVectorUnion,
@@ -1182,7 +1182,7 @@ _sparsifystructured(x) = x
 
 
 # (12) map[!] over combinations of sparse and structured matrices
-SparseOrStructuredMatrix = Union{FixedSparseCSC,SparseMatrixCSC,LinearAlgebra.StructuredMatrix}
+SparseOrStructuredMatrix = Union{FixedSparseCSC,SparseMatrixCSC,SparseMatrixCSCView,LinearAlgebra.StructuredMatrix}
 map(f::Tf, A::SparseOrStructuredMatrix, Bs::Vararg{SparseOrStructuredMatrix,N}) where {Tf,N} =
     (_checksameshape(A, Bs...); _noshapecheck_map(f, _sparsifystructured(A), map(_sparsifystructured, Bs)...))
 map!(f::Tf, C::AbstractSparseMatrixCSC, A::SparseOrStructuredMatrix, Bs::Vararg{SparseOrStructuredMatrix,N}) where {Tf,N} =

diff --git a/src/sparsematrix.jl b/src/sparsematrix.jl
@@ -2236,16 +2236,16 @@ function conj(A::AbstractSparseMatrixCSC{<:Complex})
     map!(conj, view(nzval, 1:nnz(A)), nzvalview(A))
     return SparseMatrixCSC(size(A, 1), size(A, 2), copy(getcolptr(A)), copy(rowvals(A)), nzval)
 end
-imag(A::AbstractSparseMatrixCSC{Tv,Ti}) where {Tv<:Real,Ti} = spzeros(Tv, Ti, size(A, 1), size(A, 2))
+imag(A::SparseMatrixCSCView{Tv,Ti}) where {Tv<:Real,Ti} = spzeros(Tv, Ti, size(A, 1), size(A, 2))
 
 ## Binary arithmetic and boolean operators
-(+)(A::AbstractSparseMatrixCSC, B::AbstractSparseMatrixCSC) = map(+, A, B)
-(-)(A::AbstractSparseMatrixCSC, B::AbstractSparseMatrixCSC) = map(-, A, B)
+(+)(A::SparseMatrixCSCView, B::SparseMatrixCSCView) = map(+, A, B)
+(-)(A::SparseMatrixCSCView, B::SparseMatrixCSCView) = map(-, A, B)
 
-(+)(A::AbstractSparseMatrixCSC, B::Array) = Array(A) + B
-(+)(A::Array, B::AbstractSparseMatrixCSC) = A + Array(B)
-(-)(A::AbstractSparseMatrixCSC, B::Array) = Array(A) - B
-(-)(A::Array, B::AbstractSparseMatrixCSC) = A - Array(B)
+(+)(A::SparseMatrixCSCView, B::Array) = Array(A) + B
+(+)(A::Array, B::SparseMatrixCSCView) = A + Array(B)
+(-)(A::SparseMatrixCSCView, B::Array) = Array(A) - B
+(-)(A::Array, B::SparseMatrixCSCView) = A - Array(B)
 
 ## full equality
 function ==(A1::AbstractSparseMatrixCSC, A2::AbstractSparseMatrixCSC)