Merge pull request #15 from RalphAS/ras/finaledge

correct EdgeIterator when inner abuts outer at final edge
JuliaArrays · Aug 5, 2018 · 8e3a657 · 8e3a657
2 parents 71d0eb6 + 83a1f47
commit 8e3a657
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/TiledIteration.jl b/src/TiledIteration.jl
@@ -95,6 +95,7 @@ function Base.iterate(iter::EdgeIterator, state)
     iterouter = iterate(iter.outer, state)
     iterouter === nothing && return nothing
     item = nextedgeitem(iter, iterouter[2])
+    item.I[end] > last(iter.outer.indices[end]) && return nothing
     return item, item
 end
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -109,6 +109,14 @@ end
     iter = EdgeIterator(CartesianIndices((0:4,)), CartesianIndices(1:3))
     @test collect(iter) == [CartesianIndex(0,),
                             CartesianIndex(4,)]
+    iter = EdgeIterator((Base.OneTo(2),Base.OneTo(3)),(2:2,1:3))
+    for it in iter
+        @test it ∈ iter.outer
+    end
+    iter = EdgeIterator(CartesianIndices((1:4,)),CartesianIndices((2:4,)))
+    for it in iter
+        @test it ∈ iter.outer
+    end
 end
 
 @testset "padded sizes" begin