Skip to content

make explicit that axes comparisons in tests ignore indices #30

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
matthias314 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

make explicit that axes comparisons in tests ignore indices #30

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eacd05f
made tests work with matthias314/julia#m3/ranges-equal
matthias314 Jun 23, 2024
0d0dadd
made changes independent of julia#m3/ranges-equal
matthias314 Aug 15, 2024
37df221
align changes with JuliaArrays/OffsetArrays.jl#341e990
matthias314 Aug 18, 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
16 changes: 10 additions & 6 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ else
const _oneunit = Base.oneunit
end

_no_offset_view(r::AbstractUnitRange) = first(r):last(r) # ensure 1-based indices
no_offset_axes(x, d) = _no_offset_view(axes(x, d))
no_offset_axes(x) = map(_no_offset_view, axes(x))

function test_approx_eq_periodic(a::FFTView, b)
for I in CartesianIndices(axes(b))
@test a[I-_oneunit(I)] ≈ b[I]
Expand All @@ -27,10 +31,10 @@ end

@testset "basics" begin
a = FFTView{Float64,2}((5,7))
@test axes(a) == (0:4, 0:6)
@test no_offset_axes(a) == (0:4, 0:6)
@test eltype(a) == Float64
a = FFTView{Float64}((5,7))
@test axes(a) == (0:4, 0:6)
@test no_offset_axes(a) == (0:4, 0:6)
@test eltype(a) == Float64
@test_throws MethodError FFTView{Float64,3}((5,7))
for i = 1:35
Expand All @@ -49,14 +53,14 @@ end
@test eltype(b) == Int
@test reshape(a, Val{2}) === a
@test reshape(a, Val{1}) == FFTView(convert(Vector{Float64}, collect(1:35)))
@test axes(reshape(a, Val{3})) == (0:4,0:6,0:0)
@test no_offset_axes(reshape(a, Val{3})) == (0:4,0:6,0:0)
end

@testset "convolution-shift" begin
for l in (8,9)
a = zeros(l)
v = FFTView(a)
@test axes(v,1) == 0:l-1
@test no_offset_axes(v,1) == 0:l-1
v[0] = 1
p = rand(l)
pfilt = ifft(fft(p).*fft(v))
Expand All @@ -73,7 +77,7 @@ end
for l2 in (8,9), l1 in (8,9)
a = zeros(l1,l2)
v = FFTView(a)
@test axes(v) == (0:l1-1, 0:l2-1)
@test no_offset_axes(v) == (0:l1-1, 0:l2-1)
p = rand(l1,l2)
for offset in ((0,0), (-1,0), (0,-1), (-1,-1),
(1,0), (0,1), (1,1), (1,-1), (-1,1),
Expand All @@ -92,7 +96,7 @@ using OffsetArrays
for l2 in (8,9), l1 in (8,9)
a = OffsetArray(zeros(l1,l2), (-2,-3))
v = FFTView(a)
@test axes(v) == (-2:l1-3, -3:l2-4)
@test no_offset_axes(v) == (-2:l1-3, -3:l2-4)
p = rand(l1,l2)
po = OffsetArray(copy(p), (5,-1))
for offset in ((0,0), (-1,0), (0,-1), (-1,-1),
Expand Down