Skip to content

Commit

Permalink
Fix window method and add more tests
Browse files Browse the repository at this point in the history
  • Loading branch information
roflmaostc committed Mar 27, 2021
1 parent 1c9e23f commit d268589
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 5 deletions.
1 change: 1 addition & 0 deletions src/concrete_generators.jl
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ for F in generate_window_functions_expr()
@eval function $(F[1])(::Type{T}, size::NTuple{N, Int};
offset=CtrFT,
scale=ScaFTEdge, border_in=0.8, border_out=1.0) where{N, T}
scale = get_scale(size, scale)
offset = get_offset(size, offset)
IndexFunArray(T, $(F[2]), size)
end
Expand Down
8 changes: 3 additions & 5 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ using Random

using IndexFunArrays

include("test_center_scaling.jl")
include("constructors.jl")
include("concrete_generators.jl")


@testset "Test defined array operation" begin
Expand Down Expand Up @@ -60,9 +63,4 @@ end
end



include("constructors.jl")

include("concrete_generators.jl")

return
25 changes: 25 additions & 0 deletions test/test_center_scaling.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
@testset "Check center and scaling methods" begin

@testset "Check center" begin

@test IndexFunArrays.get_offset((5,), CtrCorner) == (1.0,)
@test IndexFunArrays.get_offset((4,), CtrCorner) == (1.0,)
@test IndexFunArrays.get_offset((5, 2), CtrFT) == (3.0, 2.0)
@test IndexFunArrays.get_offset((5, 1), CtrFT) == (3.0, 1.0)
@test IndexFunArrays.get_offset((5, 2), CtrFFT) == (1.0, 1.0)

@test IndexFunArrays.get_offset((5, 2), CtrMid) == (3.0, 1.5)
@test IndexFunArrays.get_offset((5, 3), CtrMid) == (3.0, 2.0)

@test IndexFunArrays.get_offset((5, 4), CtrEnd) == (5.0, 4.0)
end


@testset "Check scaling" begin
@test IndexFunArrays.get_scale((5, 4), ScaFT) === (0.25, 0.25)
@test IndexFunArrays.get_scale((5, 4), ScaUnit) == (1, 1)
@test IndexFunArrays.get_scale((6, 5), ScaNorm) == (0.2, 0.25)
@test IndexFunArrays.get_scale((6, 5), ScaNorm) == (0.2, 0.25)
@test IndexFunArrays.get_scale((5,3), (2,11)) == (2,11)
end
end

0 comments on commit d268589

Please sign in to comment.