Skip to content

Fix cylinder snake patterns indexing a lazy iterator #81

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
SAY-5 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix cylinder snake patterns indexing a lazy iterator #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/lattices/snakepattern.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function backandforth_pattern(cylinder::InfiniteCylinder)
L = cylinder.L
N = cylinder.N
iseven(cylinder.N) || error("backandforth only defined for even period")
inds = Iterators.flatten((1:L, reverse((L + 1):(2L))) .+ (L * (i - 1)) for i in 1:2:N)
inds = collect(Iterators.flatten((1:L, reverse((L + 1):(2L))) .+ (L * (i - 1)) for i in 1:2:N))

return pattern(i::Integer) = inds[i]
end
Expand All @@ -52,14 +52,14 @@ function frontandback_pattern(cylinder::InfiniteCylinder)
N = cylinder.N

if iseven(L)
edge = L / 2
edge = L ÷ 2
rung = Iterators.flatten(zip(1:edge, (edge + 1):L))
else
edge = (L + 1) / 2
edge = (L + 1) ÷ 2
rung = Iterators.flatten((Iterators.flatten(zip(1:edge, (edge + 1):L)), edge))
end

inds = Iterators.flatten((rung .+ (L * (i - 1)) for i in 1:N))
inds = collect(Iterators.flatten((rung .+ (L * (i - 1)) for i in 1:N)))

return pattern(i::Integer) = inds[i]
end
12 changes: 12 additions & 0 deletions test/lattices.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,3 +243,15 @@ end
pattern.(linearize_index.(Tuple(y)))
end
end

@testset "cylinder snake patterns" begin
for cylinder in (InfiniteCylinder(2, 4), InfiniteCylinder(3, 3))
n = cylinder.L * cylinder.N
fb = frontandback_pattern(cylinder)
@test map(fb, 1:n) |> sort == collect(1:n)
end

baf = backandforth_pattern(InfiniteCylinder(2, 4))
@test map(baf, 1:8) |> sort == collect(1:8)
@test_throws ErrorException backandforth_pattern(InfiniteCylinder(3, 3))
end