Skip to content

Implement new iteraterprotocol for RepeatedRangeMatrix #10

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

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

Implement new iteraterprotocol for RepeatedRangeMatrix #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
302d0d1
Implement new iteraterprotocol for RepeatedRangeMatrix
strickek Jan 15, 2019
435d631
Update repeatedrange.jl
strickek Jan 16, 2019
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
24 changes: 23 additions & 1 deletion src/repeatedrange.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ Base.IndexStyle(::Type{<:RepeatedRangeMatrix}) = IndexCartesian()

if VERSION < v"0.7.0-DEV.5126"
# This coupled iteration over the two fields is 10-20x faster than Cartesian iteration
# TODO: re-implement in the new iteration protocol
@inline function Base.start(R::RepeatedRangeMatrix)
is = start(R.r)
idone = done(R.r, is)
Expand All @@ -39,6 +38,29 @@ end
return (val, (next(R.r, is), (j, js), false))
end
@inline Base.done(R::RepeatedRangeMatrix, state) = state[end]

else

@inline function Base.iterate(R::RepeatedRangeMatrix)
i, is = iterate(R.r)
j, js = iterate(R.at)
return i + j, (is, j, js)
end

@inline function Base.iterate(R::RepeatedRangeMatrix, state)
is, j, js = state
iit = iterate(R.r, is)
if iit === nothing
jit = iterate(R.at, js)
jit === nothing && return nothing
j, js = jit
i, is = iterate(R.r)
else
i, is = iit
end
return i + j, (is, j, js)
end

end

# Scalar indexing
Expand Down