Support views with BlockedIndexRange (#250)

* Support views with BlockedIndexRange

* 0.16.15

* add tests

* Update test_blockindices.jl

Author: dlfivefifty

Project.toml

@@ -1,6 +1,6 @@
 name = "BlockArrays"
 uuid = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
-version = "0.16.24"
+version = "0.16.25"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"

src/blockaxis.jl

@@ -232,6 +232,8 @@ function getindex(b::BlockedUnitRange, KR::BlockRange{1,Tuple{Base.OneTo{Int}}})
     _BlockedUnitRange(first(b),cs[Base.OneTo(j)])
 end
 
+getindex(b::BlockedUnitRange, KR::BlockSlice) = b[KR.block]
+
 _searchsortedfirst(a::AbstractVector, k) = searchsortedfirst(a, k)
 function _searchsortedfirst(a::Tuple, k)
     k ≤ first(a) && return 1

src/blocklinalg.jl

@@ -65,6 +65,8 @@ sublayout(BL::BlockLayout{MLAY,BLAY}, ::Type{<:Tuple{<:BlockSlice{BlockRange{1,T
     BlockLayout{typeof(sublayout(MLAY(),Tuple{II,Sl})), BLAY}()
 sublayout(BL::BlockLayout{MLAY,BLAY}, ::Type{<:Tuple{Sl1,Sl2}}) where {MLAY,BLAY,Sl1<:Slice,Sl2<:Slice} =
     BlockLayout{typeof(sublayout(MLAY(),Tuple{Sl1,Sl2})), BLAY}()
+sublayout(BL::BlockLayout{MLAY,BLAY}, ::Type{<:NTuple{N,<:BlockedUnitRange}}) where {N,MLAY,BLAY} =
+    BlockLayout{typeof(sublayout(MLAY(),NTuple{N,Base.OneTo{Int}})), BLAY}()
 
 # materialize views, used for `getindex`
 sub_materialize(::AbstractBlockLayout, V, _) = BlockArray(V)

src/views.jl

@@ -56,7 +56,11 @@ reindex(idxs::Tuple{BlockSlice{<:BlockRange}, Vararg{Any}},
                                             idxs[1].indices[subidxs[1].indices]),
                                 reindex(tail(idxs), tail(subidxs))...))
 
-
+reindex(idxs::Tuple{BlockedUnitRange, Vararg{Any}},
+        subidxs::Tuple{BlockSlice{<:Block}, Vararg{Any}}) =
+    (@_propagate_inbounds_meta; (BlockSlice(subidxs[1].block,
+                                            idxs[1][subidxs[1].block]),
+                                reindex(tail(idxs), tail(subidxs))...))
 # _splatmap taken from Base:
 _splatmap(f, ::Tuple{}) = ()
 _splatmap(f, t::Tuple) = (f(t[1])..., _splatmap(f, tail(t))...)

test/test_blockindices.jl

@@ -331,6 +331,10 @@ end
         @test S[Block(2)] == 2:3
         @test S[Block.(1:2)] == 1:3
         @test axes(S) == axes(b)
+
+
+        bs = BlockSlice(Block.(1:3), 1:6)
+        @test b[bs] == b
     end
 
     @testset "StaticArrays" begin

test/test_blockviews.jl

@@ -1,4 +1,4 @@
-using BlockArrays, Test, Base64
+using BlockArrays, ArrayLayouts, Test, Base64
 
 # useds to force SubArray return
 bview(a, b) = Base.invoke(view, Tuple{AbstractArray,Any}, a, b)
@@ -322,4 +322,11 @@ bview(a, b) = Base.invoke(view, Tuple{AbstractArray,Any}, a, b)
         v = BlockArray(randn(3),1:2)
         @test_skip @test_throws BlockBoundsError v[Block(1,2)]
     end
+
+    @testset "BlockedUnitRange views" begin
+        a = BlockArray(randn(3),1:2)
+        v = view(a, axes(a,1))
+        @test MemoryLayout(v) == MemoryLayout(a)
+        @test v[Block(1)] == a[Block(1)]
+    end
 end