extend MatrixMap comparison, switch order of A_mul_B! for lincombs

JuliaLinearAlgebra · Sep 26, 2019 · b22a8b8 · b22a8b8
1 parent f7abb5f
commit b22a8b8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/linearcombination.jl b/src/linearcombination.jl
@@ -67,6 +67,14 @@ else # 5-arg mul! is available for matrices
 # map types that have an allocation-free 5-arg mul! implementation
 const FreeMap = Union{MatrixMap,UniformScalingMap}
 
+function A_mul_B!(y::AbstractVector, A::LinearCombination{T,As}, x::AbstractVector) where {T, As<:Tuple{Vararg{FreeMap}}}
+    # no size checking, will be done by individual maps
+    A_mul_B!(y, A.maps[1], x)
+    for n in 2:length(A.maps)
+        mul!(y, A.maps[n], x, true, true)
+    end
+    return y
+end
 function A_mul_B!(y::AbstractVector, A::LinearCombination, x::AbstractVector)
     # no size checking, will be done by individual maps
     A_mul_B!(y, A.maps[1], x)
@@ -85,14 +93,6 @@ function A_mul_B!(y::AbstractVector, A::LinearCombination, x::AbstractVector)
     end
     return y
 end
-function A_mul_B!(y::AbstractVector, A::LinearCombination{T,As}, x::AbstractVector) where {T, As<:Tuple{Vararg{FreeMap}}}
-    # no size checking, will be done by individual maps
-    A_mul_B!(y, A.maps[1], x)
-    for n in 2:length(A.maps)
-        mul!(y, A.maps[n], x, true, true)
-    end
-    return y
-end
 
 function LinearAlgebra.mul!(y::AbstractVector, A::LinearCombination{T,As}, x::AbstractVector, α::Number=true, β::Number=false) where {T, As<:Tuple{Vararg{FreeMap}}}
     length(y) == size(A, 1) || throw(DimensionMismatch("mul!"))

diff --git a/src/wrappedmap.jl b/src/wrappedmap.jl
@@ -24,7 +24,9 @@ LinearAlgebra.transpose(A::MatrixMap{T}) where {T} =
 LinearAlgebra.adjoint(A::MatrixMap{T}) where {T} =
     WrappedMap{T}(adjoint(A.lmap); issymmetric=A._issymmetric, ishermitian=A._ishermitian, isposdef=A._isposdef)
 
-Base.:(==)(A::MatrixMap, B::MatrixMap) = (eltype(A) == eltype(B) && A.lmap == B.lmap)
+Base.:(==)(A::MatrixMap, B::MatrixMap) =
+    (eltype(A)==eltype(B) && A.lmap==B.lmap && A._issymmetric==B._issymmetric &&
+     A._ishermitian==B._ishermitian && A._isposdef==B._isposdef)
 
 if VERSION ≥ v"1.3.0-alpha.115"