Skip to content
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

Allow _AxisLookup to fallback to Dict getindex #3028

Merged
merged 4 commits into from
Jul 28, 2022
Merged

Allow _AxisLookup to fallback to Dict getindex #3028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64b51e5
Allow `_AxisLookup` to fallback to Dict `getindex`
nickrobinson251 Jul 26, 2022
2c33414
Apply suggestions from code review
odow Jul 26, 2022
22d1be4
Update test/Containers/DenseAxisArray.jl
odow Jul 26, 2022
c85a2f3
Add test for manually thrown KeyError
nickrobinson251 Jul 27, 2022
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
6 changes: 3 additions & 3 deletions src/Containers/DenseAxisArray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,17 @@ function build_lookup(ax)
return _AxisLookup(d)
end

Base.getindex(x::_AxisLookup{Dict{K,Int}}, key::K) where {K} = x.data[key]
Base.getindex(x::_AxisLookup{Dict{K,Int}}, key) where {K} = x.data[key]
Base.getindex(::_AxisLookup{Dict{K,Int}}, key::Colon) where {K} = key

function Base.getindex(
x::_AxisLookup{Dict{K,Int}},
keys::AbstractVector{<:K},
keys::AbstractVector,
) where {K}
return [x[key] for key in keys]
end

function Base.get(x::_AxisLookup{Dict{K,Int}}, key::K, default) where {K}
function Base.get(x::_AxisLookup{Dict{K,Int}}, key, default) where {K}
return get(x.data, key, default)
end

Expand Down
14 changes: 14 additions & 0 deletions test/Containers/DenseAxisArray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ using Test
@test isassigned(A, 2)
@test !isassigned(A, 1)
@test length.(axes(A)) == (2,)
@test_throws KeyError A["2"]

correct_answer = DenseAxisArray([2.0, 3.0], 2:3)
@test sprint(show, correct_answer) == """
Expand Down Expand Up @@ -93,6 +94,14 @@ And data, a 2-element $(Vector{Float64}):
@test 1 .+ A == correct_answer
end

@testset "String index set" begin
A = @inferred DenseAxisArray([1.0, 2.0], ["a", "b"])
@test (@inferred A["a"]) == (@inferred A[GenericString("a")]) == 1.0
@test (@inferred A[["a", "b"]]) ==
(@inferred A[[GenericString("a"), GenericString("b")]]) ==
A
end

@testset "Mixed range/symbol index sets" begin
A = @inferred DenseAxisArray([1 2; 3 4], 2:3, [:a, :b])
@test size(A) == (2, 2)
Expand Down Expand Up @@ -248,6 +257,11 @@ And data, a 0-dimensional $(Array{Int,0}):
@test (@inferred C[2:3, [:a, :b]]) == C
@test (@inferred C[2, [:a, :b]]) == DenseAxisArray([5.0, 6.0], [:a, :b])
@test (@inferred C[2:3, :b]) == DenseAxisArray([6.0, 8.0], 2:3)

D = DenseAxisArray([5.0 6.0; 7.0 8.0], 2:3, ["a", "b"])
@test (@inferred D[2, GenericString("b")]) == 6.0
@test (@inferred D[2, [GenericString("a"), GenericString("b")]]) ==
DenseAxisArray([5.0, 6.0], ["a", "b"])
end
@testset "BitArray" begin
x = DenseAxisArray([0 1; 1 0], [:a, :b], 1:2)
Expand Down