diff --git a/Project.toml b/Project.toml index f215210..fc6a88d 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "ArrayLayouts" uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" authors = ["Sheehan Olver "] -version = "1.12.0" +version = "1.12.1" [deps] FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b" diff --git a/src/ArrayLayouts.jl b/src/ArrayLayouts.jl index 34bd8dc..6f3d0bf 100644 --- a/src/ArrayLayouts.jl +++ b/src/ArrayLayouts.jl @@ -204,6 +204,7 @@ getindex(A::LayoutVector, kr::AbstractVector) = layout_getindex(A, kr) getindex(A::LayoutVector, kr::Colon) = layout_getindex(A, kr) getindex(A::AdjOrTrans{<:Any,<:LayoutVector}, kr::Integer, jr::Colon) = layout_getindex(A, kr, jr) getindex(A::AdjOrTrans{<:Any,<:LayoutVector}, kr::Integer, jr::AbstractVector) = layout_getindex(A, kr, jr) +getindex(A::AdjOrTrans{<:Any,<:LayoutVector}, kr::AbstractVector, jr::AbstractVector) = layout_getindex(A, kr, jr) *(a::Zeros{<:Any,2}, b::LayoutMatrix) = FillArrays.mult_zeros(a, b) *(a::LayoutMatrix, b::Zeros{<:Any,2}) = FillArrays.mult_zeros(a, b) diff --git a/test/test_layoutarray.jl b/test/test_layoutarray.jl index ce260fd..b044606 100644 --- a/test/test_layoutarray.jl +++ b/test/test_layoutarray.jl @@ -49,6 +49,8 @@ Base.copy(A::MyVector) = MyVector(copy(A.A)) @test a[1:3] == a.A[1:3] @test a[:] == a @test (a')[1,:] == (a')[1,1:3] == a + @test (a')[1:1, :] == (a')[1:1,1:3] == a' + @test (a')[1:1, 2:3] == (a')[1:1,2:3] == a[2:3]' @test sprint(show, "text/plain", a) == "$(summary(a)):\n 1.0\n 2.0\n 3.0" @test B*a ≈ B*a.A @test B'*a ≈ B'*a.A