Merge pull request #105 from vpuri3/methods

some missing methods

Project.toml

@@ -1,7 +1,7 @@
 name = "SciMLOperators"
 uuid = "c0aeaf25-5076-4817-a8d5-81caf7dfa961"
 authors = ["xtalax <[email protected]>"]
-version = "0.1.13"
+version = "0.1.14"
 
 [deps]
 ArrayInterfaceCore = "30b0a656-2188-435a-8636-2ec0e6a096e2"

src/SciMLOperators.jl

@@ -17,7 +17,7 @@ import Base: +, -, *, /, \, ∘, ==, conj, exp, kron
 import Base: iszero, inv, adjoint, transpose, size, convert
 import LinearAlgebra: mul!, ldiv!, lmul!, rmul!, factorize
 import LinearAlgebra: Matrix, Diagonal
-import SparseArrays: sparse
+import SparseArrays: sparse, issparse
 
 """
 $(TYPEDEF)
@@ -40,8 +40,8 @@ include("left.jl")
 include("multidim.jl")
 
 include("scalar.jl")
-include("basic.jl")
 include("matrix.jl")
+include("basic.jl")
 include("batch.jl")
 include("func.jl")
 include("tensor.jl")

src/basic.jl

@@ -212,7 +212,7 @@ end
 Base.:-(L::AbstractSciMLOperator) = ScaledOperator(-true, L)
 Base.:+(L::AbstractSciMLOperator) = L
 
-Base.convert(::Type{AbstractMatrix}, L::ScaledOperator) = L.λ.val * convert(AbstractMatrix, L.L)
+Base.convert(::Type{AbstractMatrix}, L::ScaledOperator) = convert(Number,L.λ) * convert(AbstractMatrix, L.L)
 SparseArrays.sparse(L::ScaledOperator) = L.λ * sparse(L.L)
 
 # traits
@@ -311,7 +311,14 @@ end
 AddedOperator(L::AbstractSciMLOperator) = L
 
 # constructors
-Base.:+(ops::AbstractSciMLOperator...) = AddedOperator(ops...)
+function Base.:+(ops::Union{AbstractSciMLOperator, AbstractMatrix}...)
+    ops_ = ()
+    for op in ops
+        op = op isa AbstractMatrix ? MatrixOperator(op) : op
+        ops_ = (ops_..., op)
+    end
+    AddedOperator(ops_...)
+end
 Base.:+(A::AbstractSciMLOperator, B::AddedOperator) = AddedOperator(A, B.ops...)
 Base.:+(A::AddedOperator, B::AbstractSciMLOperator) = AddedOperator(A.ops..., B)
 Base.:+(A::AddedOperator, B::AddedOperator) = AddedOperator(A.ops..., B.ops...)
@@ -327,6 +334,8 @@ function Base.:+(Z::NullOperator, A::AddedOperator)
 end
 
 Base.:-(A::AbstractSciMLOperator, B::AbstractSciMLOperator) = AddedOperator(A, -B)
+Base.:-(A::AbstractSciMLOperator, B::AbstractMatrix) = A - MatrixOperator(B)
+Base.:-(A::AbstractMatrix, B::AbstractSciMLOperator) = MatrixOperator(A) - B
 
 for op in (
            :+, :-,
@@ -350,7 +359,7 @@ for op in (
 end
 
 Base.convert(::Type{AbstractMatrix}, L::AddedOperator) = sum(op -> convert(AbstractMatrix, op), L.ops)
-SparseArrays.sparse(L::AddedOperator) = sum(_sparse, L.ops)
+SparseArrays.sparse(L::AddedOperator) = sum(sparse, L.ops)
 
 # traits
 Base.size(L::AddedOperator) = size(first(L.ops))
@@ -482,7 +491,7 @@ for op in (
 end
 
 Base.convert(::Type{AbstractMatrix}, L::ComposedOperator) = prod(op -> convert(AbstractMatrix, op), L.ops)
-SparseArrays.sparse(L::ComposedOperator) = prod(_sparse, L.ops)
+SparseArrays.sparse(L::ComposedOperator) = prod(sparse, L.ops)
 
 # traits
 Base.size(L::ComposedOperator) = (size(first(L.ops), 1), size(last(L.ops),2))
@@ -686,7 +695,7 @@ function LinearAlgebra.mul!(v::AbstractVecOrMat, L::InvertedOperator, u::Abstrac
     axpy!(β, L.cache, v)
 end
 
-function LinearAlgebra.ldiv!(v::AbstractVecOrMat, L::InvertedOperator, u)
+function LinearAlgebra.ldiv!(v::AbstractVecOrMat, L::InvertedOperator, u::AbstractVecOrMat)
     mul!(v, L.L, u)
 end
 

src/interface.jl

@@ -167,12 +167,12 @@ issquare(::Union{
 issquare(A...) = @. (&)(issquare(A)...)
 
 Base.isreal(L::AbstractSciMLOperator{T}) where{T} = T <: Real
-Base.Matrix(L::AbstractSciMLLinearOperator) = Matrix(convert(AbstractMatrix, L))
+Base.Matrix(L::AbstractSciMLOperator) = Matrix(convert(AbstractMatrix, L))
 
-LinearAlgebra.exp(L::AbstractSciMLLinearOperator,t) = exp(t*L)
+LinearAlgebra.exp(L::AbstractSciMLOperator,t) = exp(t*L)
 has_exp(L::AbstractSciMLLinearOperator) = true
-expmv(L::AbstractSciMLLinearOperator,u,p,t) = exp(L,t)*u
-expmv!(v,L::AbstractSciMLLinearOperator,u,p,t) = mul!(v,exp(L,t),u)
+expmv(L::AbstractSciMLOperator,u,p,t) = exp(L,t)*u
+expmv!(v,L::AbstractSciMLOperator,u,p,t) = mul!(v,exp(L,t),u)
 
 ###
 # fallback implementations
@@ -188,46 +188,37 @@ function Base.:(==)(L1::AbstractSciMLOperator, L2::AbstractSciMLOperator)
     convert(AbstractMatrix, L1) == convert(AbstractMatrix, L1)
 end
 
-Base.@propagate_inbounds function Base.getindex(L::AbstractSciMLLinearOperator, I::Vararg{Any,N}) where {N}
+Base.@propagate_inbounds function Base.getindex(L::AbstractSciMLOperator, I::Vararg{Any,N}) where {N}
     convert(AbstractMatrix, L)[I...]
 end
-function Base.getindex(L::AbstractSciMLLinearOperator, I::Vararg{Int, N}) where {N}
+function Base.getindex(L::AbstractSciMLOperator, I::Vararg{Int, N}) where {N}
     convert(AbstractMatrix,L)[I...]
 end
 
-LinearAlgebra.exp(L::AbstractSciMLLinearOperator) = exp(Matrix(L))
-LinearAlgebra.opnorm(L::AbstractSciMLLinearOperator, p::Real=2) = opnorm(convert(AbstractMatrix,L), p)
+LinearAlgebra.exp(L::AbstractSciMLOperator) = exp(Matrix(L))
+LinearAlgebra.opnorm(L::AbstractSciMLOperator, p::Real=2) = opnorm(convert(AbstractMatrix,L), p)
 for pred in (
              :issymmetric,
              :ishermitian,
              :isposdef,
             )
-    @eval function LinearAlgebra.$pred(L::AbstractSciMLLinearOperator)
+    @eval function LinearAlgebra.$pred(L::AbstractSciMLOperator)
         $pred(convert(AbstractMatrix, L))
     end
 end
 for op in (
            :sum,:prod
           )
-  @eval function LinearAlgebra.$op(L::AbstractSciMLLinearOperator; kwargs...)
+  @eval function LinearAlgebra.$op(L::AbstractSciMLOperator; kwargs...)
       $op(convert(AbstractMatrix, L); kwargs...)
   end
 end
 
-for op in (
-           :+, :-,
-          )
-
-    @eval function Base.$op(L::AbstractSciMLLinearOperator, u::AbstractVecOrMat)
-        $op(convert(AbstractMatrix,L), u)
-    end
-end
-
-function LinearAlgebra.mul!(v::AbstractVecOrMat, L::AbstractSciMLLinearOperator, u::AbstractVecOrMat)
+function LinearAlgebra.mul!(v::AbstractVecOrMat, L::AbstractSciMLOperator, u::AbstractVecOrMat)
     mul!(v, convert(AbstractMatrix,L), u)
 end
 
-function LinearAlgebra.mul!(v::AbstractVecOrMat, L::AbstractSciMLLinearOperator, u::AbstractVecOrMat, α, β)
+function LinearAlgebra.mul!(v::AbstractVecOrMat, L::AbstractSciMLOperator, u::AbstractVecOrMat, α, β)
     mul!(v, convert(AbstractMatrix,L), u, α, β)
 end
 #

src/matrix.jl

@@ -52,6 +52,7 @@ isconstant(L::MatrixOperator) = L.update_func == DEFAULT_UPDATE_FUNC
 Base.iszero(L::MatrixOperator) = iszero(L.A)
 
 SparseArrays.sparse(L::MatrixOperator) = sparse(L.A)
+SparseArrays.issparse(L::MatrixOperator) = issparse(L.A)
 
 # TODO - add tests for MatrixOperator indexing
 # propagate_inbounds here for the getindex fallback
@@ -142,12 +143,16 @@ for fact in (
              :svd, :svd!,
             )
 
-    @eval LinearAlgebra.$fact(L::AbstractSciMLLinearOperator, args...) =
+    @eval LinearAlgebra.$fact(L::AbstractSciMLOperator, args...) =
         InvertibleOperator($fact(convert(AbstractMatrix, L), args...))
-    @eval LinearAlgebra.$fact(L::AbstractSciMLLinearOperator; kwargs...) =
+    @eval LinearAlgebra.$fact(L::AbstractSciMLOperator; kwargs...) =
         InvertibleOperator($fact(convert(AbstractMatrix, L); kwargs...))
 end
 
+function Base.convert(::Type{<:Factorization}, L::InvertibleOperator{T,<:Factorization}) where{T}
+    L.F
+end
+
 function Base.convert(::Type{AbstractMatrix}, L::InvertibleOperator)
     if L.F isa Adjoint
         convert(AbstractMatrix,L.F')'

src/multidim.jl

@@ -21,7 +21,7 @@ for op in (
     end
 end
 
-function LinearAlgebra.mul!(v::AbstractArray, L::AbstractSciMLLinearOperator, u::AbstractArray)
+function LinearAlgebra.mul!(v::AbstractArray, L::AbstractSciMLOperator, u::AbstractArray)
     u isa AbstractVecOrMat && @error "LinearAlgebra.mul! not defined for $(typeof(L)), $(typeof(u))."
 
     sizes = _mat_sizes(L, u)
@@ -34,7 +34,7 @@ function LinearAlgebra.mul!(v::AbstractArray, L::AbstractSciMLLinearOperator, u:
     v
 end
 
-function LinearAlgebra.mul!(v::AbstractArray, L::AbstractSciMLLinearOperator, u::AbstractArray, α, β)
+function LinearAlgebra.mul!(v::AbstractArray, L::AbstractSciMLOperator, u::AbstractArray, α, β)
     u isa AbstractVecOrMat && @error "LinearAlgebra.mul! not defined for $(typeof(L)), $(typeof(u))."
 
     sizes = _mat_sizes(L, u)
@@ -47,7 +47,7 @@ function LinearAlgebra.mul!(v::AbstractArray, L::AbstractSciMLLinearOperator, u:
     v
 end
 
-function LinearAlgebra.ldiv!(v::AbstractArray, L::AbstractSciMLLinearOperator, u::AbstractArray)
+function LinearAlgebra.ldiv!(v::AbstractArray, L::AbstractSciMLOperator, u::AbstractArray)
     u isa AbstractVecOrMat && @error "LinearAlgebra.ldiv! not defined for $(typeof(L)), $(typeof(u))."
 
     sizes = _mat_sizes(L, u)
@@ -60,7 +60,7 @@ function LinearAlgebra.ldiv!(v::AbstractArray, L::AbstractSciMLLinearOperator, u
     v
 end
 
-function LinearAlgebra.ldiv!(L::AbstractSciMLLinearOperator, u::AbstractArray)
+function LinearAlgebra.ldiv!(L::AbstractSciMLOperator, u::AbstractArray)
     u isa AbstractVecOrMat && @error "LinearAlgebra.ldiv! not defined for $(typeof(L)), $(typeof(u))."
 
     sizes = _mat_sizes(L, u)