From 77fec778b042054511e66c1fa552afe48826852b Mon Sep 17 00:00:00 2001 From: John Zito Date: Mon, 2 Mar 2020 04:31:56 -0600 Subject: [PATCH] More strided -> abstract --- src/pdiagmat.jl | 8 ++++---- src/scalmat.jl | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pdiagmat.jl b/src/pdiagmat.jl index f291b5a..1d77a7f 100644 --- a/src/pdiagmat.jl +++ b/src/pdiagmat.jl @@ -41,8 +41,8 @@ function pdadd!(r::Matrix, a::Matrix, b::PDiagMat, c) end *(a::PDiagMat, c::T) where {T<:Real} = PDiagMat(a.diag * c) -*(a::PDiagMat, x::StridedVecOrMat) = a.diag .* x -\(a::PDiagMat, x::StridedVecOrMat) = a.inv_diag .* x +*(a::PDiagMat, x::AbstractVecOrMat) = a.diag .* x +\(a::PDiagMat, x::AbstractVecOrMat) = a.inv_diag .* x Base.kron(A::PDiagMat, B::PDiagMat) = PDiagMat( vcat([A.diag[i] * B.diag for i in 1:dim(A)]...) ) ### Algebra @@ -84,8 +84,8 @@ unwhiten!(r::StridedMatrix, a::PDiagMat, x::StridedMatrix) = ### quadratic forms -quad(a::PDiagMat, x::StridedVector) = wsumsq(a.diag, x) -invquad(a::PDiagMat, x::StridedVector) = wsumsq(a.inv_diag, x) +quad(a::PDiagMat, x::AbstractVector) = wsumsq(a.diag, x) +invquad(a::PDiagMat, x::AbstractVector) = wsumsq(a.inv_diag, x) function quad!(r::AbstractArray, a::PDiagMat, x::StridedMatrix) m, n = size(x) diff --git a/src/scalmat.jl b/src/scalmat.jl index a8c49ff..9c3533b 100644 --- a/src/scalmat.jl +++ b/src/scalmat.jl @@ -34,8 +34,8 @@ end *(a::ScalMat, c::T) where {T<:Real} = ScalMat(a.dim, a.value * c) /(a::ScalMat{T}, c::T) where {T<:Real} = ScalMat(a.dim, a.value / c) -*(a::ScalMat, x::StridedVecOrMat) = a.value * x -\(a::ScalMat, x::StridedVecOrMat) = a.inv_value * x +*(a::ScalMat, x::AbstractVecOrMat) = a.value * x +\(a::ScalMat, x::AbstractVecOrMat) = a.inv_value * x Base.kron(A::ScalMat, B::ScalMat) = ScalMat( dim(A) * dim(B), A.value * B.value ) ### Algebra