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

add method for getindex(::ProductIterator, inds...) #49965

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

add method for getindex(::ProductIterator, inds...) #49965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d84bc95
add getindex method to ProductIterator
MasonProtter May 26, 2023
8cc6157
Merge branch 'master' into patch-9
MasonProtter Nov 26, 2023
bbc374f
use `Base.map`
MasonProtter Nov 26, 2023
af4e77a
Update iterators.jl
MasonProtter Nov 26, 2023
dced4c2
add some tests
MasonProtter Nov 26, 2023
b59e86b
whitespace
MasonProtter Nov 26, 2023
abb88d5
Merge branch 'master' into patch-9
MasonProtter Dec 6, 2023
0c089e5
fixup
MasonProtter Dec 6, 2023
5493114
Update iterators.jl
MasonProtter Dec 6, 2023
e7b6aa2
Merge branch 'master' into patch-9
MasonProtter Dec 9, 2023
2d9d083
Merge branch 'master' into patch-9
MasonProtter Nov 19, 2024
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
11 changes: 8 additions & 3 deletions base/iterators.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ baremodule Iterators
import ..@__MODULE__, ..parentmodule
const Base = parentmodule(@__MODULE__)
using .Base:
@inline, Pair, Pairs, AbstractDict, IndexLinear, IndexStyle, AbstractVector, Vector,
SizeUnknown, HasLength, HasShape, IsInfinite, EltypeUnknown, HasEltype, OneTo,
@inline, @noinline, Pair, Pairs, AbstractDict, IndexLinear, IndexStyle, AbstractVector,
Vector, SizeUnknown, HasLength, HasShape, IsInfinite, EltypeUnknown, HasEltype, OneTo,
@propagate_inbounds, @isdefined, @boundscheck, @inbounds, Generator, IdDict,
AbstractRange, AbstractUnitRange, UnitRange, LinearIndices, TupleOrBottom,
AbstractRange, AbstractUnitRange, UnitRange, LinearIndices, TupleOrBottom, DimensionMismatch,
(:), |, +, -, *, !==, !, ==, !=, <=, <, >, >=, =>, missing,
any, _counttuple, eachindex, ntuple, zero, prod, reduce, in, firstindex, lastindex,
tail, fieldtypes, min, max, minimum, zero, oneunit, promote, promote_shape, LazyString
Expand Down Expand Up @@ -1166,6 +1166,11 @@ end
reverse(p::ProductIterator) = ProductIterator(Base.map(reverse, p.iterators))
last(p::ProductIterator) = Base.map(last, p.iterators)
intersect(a::ProductIterator, b::ProductIterator) = ProductIterator(intersect.(a.iterators, b.iterators))
function getindex(p::ProductIterator, inds...)
length(inds) == length(p.iterators) || prod_indexing_error(p, inds)
Base.map(getindex, p.iterators, inds)
end
@noinline prod_indexing_error(p, inds) = throw(DimensionMismatch("Attempted to index a product of $(length(p.iterators)) iterators with $(length(inds)) indices."))

# flatten an iterator of iterators

Expand Down
12 changes: 12 additions & 0 deletions test/iterators.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,18 @@ let (a, b) = (1:3, [4 6;
end
end

let
p1 = product(Dict(:a => 1, :b => 2), [1, 2, 3])
p2 = product(-5:5, 12:10000)
p3 = product(rand(3), (x for x in 1:10 if rand(Bool)))
p4 = product([:a, :b, :c], ['i', 'j', 'k'])
@test p1[:b, 3] == (2, 3)
@test p2[2, 1] == (-4, 12)
@test_throws MethodError p3[1, 2]
@test p4[2, 3] == (:b, 'k')
@test_throws DimensionMismatch p4[2]
end

# collect stateful iterator
let itr
itr = Iterators.Stateful(Iterators.map(identity, 1:5))
Expand Down