Avoid ambiguity with Triangular and Diagonal (#36)

* Avoid ambiguity with Traingular and Diagonal

* Update test_muladd.jl

* v0.4.4

Author: dlfivefifty

Project.toml

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

src/triangular.jl

@@ -12,6 +12,8 @@ rowsupport(::TriangularLayout{'L'}, A, j) = isempty(j) ? (1:0) : rowsupport(tria
 mulreduce(M::Mul{<:TriangularLayout}) = Lmul(M)
 mulreduce(M::Mul{<:TriangularLayout,<:TriangularLayout}) = Lmul(M)
 mulreduce(M::Mul{<:Any,<:TriangularLayout}) = Rmul(M)
+mulreduce(M::Mul{<:DiagonalLayout,<:TriangularLayout}) = Lmul(M)
+mulreduce(M::Mul{<:TriangularLayout,<:DiagonalLayout}) = Rmul(M)
 
 similar(M::Lmul{<:TriangularLayout{'U'},<:TriangularLayout{'U'}}) = UpperTriangular(Matrix{eltype(M)}(undef, size(M)))
 similar(M::Lmul{<:TriangularLayout{'L'},<:TriangularLayout{'L'}}) = LowerTriangular(Matrix{eltype(M)}(undef, size(M)))

test/test_muladd.jl

@@ -519,7 +519,7 @@ Random.seed!(0)
             @test ArrayLayouts.rmul!(copy(A),UpperTriangular(B)) == A*UpperTriangular(B)
         end
 
-        @testset "Diagonal and SymTridiagonal" begin
+        @testset "Diagonal" begin
             A = randn(5,5)
             B = Diagonal(randn(5))
             @test MemoryLayout(B) == DiagonalLayout{DenseColumnMajor}()
@@ -547,6 +547,13 @@ Random.seed!(0)
             @test @inferred(mul(LowerTriangular(A), UpperTriangular(B))) isa Matrix
             @test @inferred(mul(UnitUpperTriangular(A), LowerTriangular(B))) isa Matrix
         end
+
+        @testset "diag * tri" begin
+            D = Diagonal(randn(5))
+            U = UpperTriangular(randn(5,5))
+            @test mul(D,U) == D*U
+            @test mul(U,D) == U*D
+        end
     end
 
     @testset "MulAdd" begin