Resolve ambiguity with UpperTriangular * Diagonal{<:Any,<:LayoutVector} (#129)

* Resolve ambiguity with UpperTriangular * Diagonal{<:Any,<:LayoutVector}

* Update ArrayLayouts.jl

Author: dlfivefifty

Project.toml

@@ -1,7 +1,7 @@
 name = "ArrayLayouts"
 uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
 authors = ["Sheehan Olver <[email protected]>"]
-version = "1.0"
+version = "1.0.1"
 
 [deps]
 FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"

src/ArrayLayouts.jl

@@ -192,6 +192,8 @@ getindex(A::AdjOrTrans{<:Any,<:LayoutVector}, kr::Integer, jr::AbstractVector) =
 *(A::AbstractMatrix, B::Diagonal{<:Any,<:LayoutVector}) = mul(A, B)
 *(A::Diagonal{<:Any,<:LayoutVector}, B::LayoutMatrix) = mul(A, B)
 *(A::LayoutMatrix, B::Diagonal{<:Any,<:LayoutVector}) = mul(A, B)
+*(A::UpperTriangular, B::Diagonal{<:Any,<:LayoutVector}) = mul(A, B)
+*(A::Diagonal{<:Any,<:LayoutVector}, B::UpperTriangular) = mul(A, B)
 *(A::Diagonal{<:Any,<:LayoutVector}, B::Diagonal) = mul(A, B)
 *(A::Diagonal, B::Diagonal{<:Any,<:LayoutVector}) = mul(A, B)
 

test/test_layoutarray.jl

@@ -323,6 +323,8 @@ MemoryLayout(::Type{MyVector}) = DenseColumnMajor()
         @test D * A' ≈ D * A.A'
         @test A' * D ≈ A.A' * D
 
+        @test T * D ≈ T .* D.diag'
+        @test D * T ≈ D.diag .* T
         @test A * Adjoint(T) ≈ A.A * Adjoint(T)
         @test A * Transpose(T) ≈ A.A * Transpose(T)
         @test Adjoint(T) * A ≈ Adjoint(T) * A.A