Skip to content

Commit

Permalink
add missing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
r9y9 committed Jun 21, 2015
1 parent a730b21 commit 961d496
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 8 deletions.
2 changes: 2 additions & 0 deletions src/SPTK.jl
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ export
ignorm,
freqt!,
freqt,
frqtr!,
frqtr,
mgc2mgc!,
mgc2mgc,
mgc2sp!,
Expand Down
6 changes: 3 additions & 3 deletions src/conversions.jl
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,9 @@ function freqt!(dst_ceps::Vector{Cdouble}, src_ceps::Vector{Cdouble}, α)
dst_ceps
end

function freqt(c::Vector{Cdouble}, order, α)
dst_ceps = zeros(dst_order + 1)
freqt!(dst_ceps, c, α)
function freqt(ceps::Vector{Cdouble}, order, α)
dst_ceps = zeros(order + 1)
freqt!(dst_ceps, ceps, α)
end

function frqtr!(dst_ceps::Vector{Cdouble}, src_ceps::Vector{Cdouble}, α)
Expand Down
17 changes: 12 additions & 5 deletions test/conversions.jl
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,19 @@ function test_ignorm(order, γ)
@test_approx_eq dummy_ceps c
end

function test_freqt(src_order, dst_order, α, f::Function)
function test_freqt(src_order, dst_order, α, f::Symbol=:freqt)
f = eval(f)
inplacef = eval(symbol(string(f, :!)))

srand(98765)
src_ceps = rand(src_order + 1)
dst_ceps = zeros(dst_order + 1)
f(dst_ceps, src_ceps, 0.41)
dst_ceps_inplace = zeros(dst_order + 1)

dst_ceps = f(src_ceps, dst_order, α)
inplacef(dst_ceps_inplace, src_ceps, α)

@test !any(isnan(dst_ceps))
@test_approx_eq dst_ceps dst_ceps_inplace
end

function test_mgc2mgc(dst_order, dst_α, dst_γ, src_order, src_α, src_γ)
Expand Down Expand Up @@ -215,8 +222,8 @@ for src_order in [15, 20, 25, 30]
for dst_order in [15, 20, 25, 30]
for α in [0.35, 0.41, 0.5]
println(" where dst_order = $dst_order, src_order = $src_order, α = ")
test_freqt(src_order, dst_order, α, freqt!)
test_freqt(src_order, dst_order, α, SPTK.frqtr!)
test_freqt(src_order, dst_order, α, :freqt)
test_freqt(src_order, dst_order, α, :frqtr)
end
end
end
Expand Down

0 comments on commit 961d496

Please sign in to comment.