fix(dsp): bug fix for #48

org-arl · Nov 6, 2024 · 8a4ee16 · 8a4ee16 · mchitre · Nov 6, 2024
1 parent e49039c
commit 8a4ee16
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "SignalAnalysis"
 uuid = "df1fea92-c066-49dd-8b36-eace3378ea47"
 authors = ["Mandar Chitre <[email protected]>"]
-version = "0.9.1"
+version = "0.9.2"
 
 [deps]
 DSP = "717857b8-e6f2-59f4-9121-6e50c889abd2"

diff --git a/src/dsp.jl b/src/dsp.jl
@@ -8,7 +8,7 @@ export fir, removedc, removedc!, demon
 export upconvert, downconvert, rrcosfir, rcosfir
 export mseq, gmseq, circconv, circcorr, goertzel, pll, hadamard
 export mfilter, findsignal, dzt, idzt
-export istft, whiten, filt, filtfilt, resample, delay!, compose
+export istft, whiten, filt, filtfilt, resample, delay, delay!, compose
 
 """
 $(SIGNATURES)
@@ -683,7 +683,7 @@ function delay!(x, v::Real; npad=32)
   ifft!(X)
   for (i, j) ∈ zip(eachindex(x), 1:length(x))
     k = j - vi + npad
-    if k < 1 || k > length(X) ÷ 2
+    if k < 1 || k > length(X)
       x[i] = 0
     elseif eltype(x) <: Complex
       x[i] = X[k]
@@ -696,6 +696,14 @@ end
 
 delay!(x, t::Units.Unitful.Time; kwargs...) = delay!(x, inseconds(t) * framerate(x); kwargs...)
 
+"""
+    delay(x, v)
+
+Create a delayed version of signal `x` with `v` units of delay.
+See [`delay!`](@ref) for details.
+"""
+delay(x, v; kwargs...) = delay!(copy(x), v; kwargs)
+
 """
 $(SIGNATURES)
 Finds up to `n` strongest copies of reference signal `r` in signal `s`. The reference

diff --git a/test/tests-core.jl b/test/tests-core.jl
@@ -670,6 +670,8 @@ function test_dsp()
   delay!(x, 10.7)
   delay!(x, 21.3)
   @test samples(x) ≈ y atol=0.05
+
+  x = signal(vcat(zeros(128), [1.0, 2.0, 3.0, 2.0, 1.0], zeros(128)), 100.0)
   y = copy(samples(x))
   delay!(x, 0.1s)
   delay!(x, -10)
@@ -684,6 +686,8 @@ function test_dsp()
   delay!(x, 10.7)
   delay!(x, 21.3)
   @test samples(x) ≈ y atol=0.05
+
+  x = signal(vcat(zeros(128), ComplexF64[1.0, 2.0, 3.0, 2.0, 1.0], zeros(128)), 100.0)
   y = copy(samples(x))
   delay!(x, 0.1s)
   delay!(x, -10)
@@ -698,11 +702,19 @@ function test_dsp()
   delay!(x, 10.7)
   delay!(x, 21.3)
   @test samples(x) ≈ y atol=0.05
+
+  x = signal(vcat(zeros(ComplexF32, 128), ComplexF32[1.0, 2.0, 3.0, 2.0, 1.0], zeros(ComplexF32, 128)), 100.0)
   y = copy(samples(x))
   delay!(x, 0.1s)
   delay!(x, -10)
   @test samples(x) ≈ y atol=1e-3
 
+  x = signal(Float64[1,2,3,4,5,6,7,0],3)
+  y = copy(samples(x))
+  delay!(x, 0.9999999)
+  delay!(x, -0.9999999)
+  @test samples(x) ≈ y atol=1e-3
+
   x = rand(rng, ComplexF64, 4096)
   @test vec(dzt(x, length(x))) == x
   @test dzt(x, 1) ≈ fft(x) / sqrt(length(x))