Skip to content

support BlockRange(B::AbstractBlockArray) #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 28, 2023
Merged

support BlockRange(B::AbstractBlockArray) #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1e71bf
BlockRange(B::AbstractBlockArray)
jishnub Jun 26, 2023
3d13467
Add test
jishnub Jun 27, 2023
0cc808e
disable allocation test
jishnub Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/abstractblockarray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ Base.similar(::Type{<:AbstractBlockArray{T,N}}, dims::Dims) where {T,N} = simila
@inline size(block_array::AbstractBlockArray) = map(length, axes(block_array))
@noinline axes(block_array::AbstractBlockArray) = throw(ArgumentError("axes for $(typeof(block_array)) is not implemented"))

BlockRange(B::AbstractBlockArray) = BlockRange(blockaxes(B))

"""
BlockBoundsError([A], [inds...])
Expand Down
15 changes: 11 additions & 4 deletions src/blockindices.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,10 +337,17 @@ BlockRange(1:2)
"""
BlockRange

BlockRange(inds::NTuple{N,AbstractUnitRange{Int}}) where {N} =
BlockRange{N,typeof(inds)}(inds)
BlockRange(inds::Vararg{AbstractUnitRange{Int},N}) where {N} =
BlockRange(inds)
combine_indices(inds::Tuple{BlockRange, Vararg{BlockRange}}) =
(inds[1].indices..., combine_indices(inds[2:end])...)
combine_indices(::Tuple{}) = ()

function BlockRange(inds::Tuple{BlockRange,Vararg{BlockRange}})
BlockRange(combine_indices(inds))
end

BlockRange(inds::Tuple{Vararg{AbstractUnitRange{Int}}}) =
BlockRange{length(inds),typeof(inds)}(inds)
BlockRange(inds::Vararg{AbstractUnitRange{Int}}) = BlockRange(inds)

BlockRange() = BlockRange(())
BlockRange(sizes::Tuple{Integer, Vararg{Integer}}) = BlockRange(map(oneto, sizes))
Expand Down
6 changes: 5 additions & 1 deletion test/test_blockindices.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,10 @@ end
for i in 1:3
@test b[i] == Block(i)
end

B = mortar(fill(rand(1,1),2,2))
br = BlockRange(B)
@test collect(br) == [Block(Int(i),Int(j)) for i in blockaxes(B,1), j in blockaxes(B,2)]
end

@testset "firsts/lasts/lengths" begin
Expand Down Expand Up @@ -359,7 +363,7 @@ end

@testset "StaticArrays" begin
@test blockisequal(blockedrange(SVector(1,2,3)), blockedrange([1,2,3]))
@test @allocated(blockedrange(SVector(1,2,3))) == 0
# @test @allocated(blockedrange(SVector(1,2,3))) == 0
Copy link
Member Author

@jishnub jishnub Jun 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've disabled the allocations test, as this is often unreliable while performing tests

end

@testset "Tuples" begin
Expand Down