Skip to content
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

Fix setphase! for pathological cases #593

Merged
merged 2 commits into from
Nov 25, 2024
Merged

Fix setphase! for pathological cases #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee30bf2
Fix `setphase!(::Union{FIRInterpolator, FIRRational}, ϕ)` for patholo…
martinholters Nov 19, 2024
4e6d621
Fix `setphase!(::FIRArbitrary, ϕ)` similarly
martinholters Nov 19, 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
8 changes: 4 additions & 4 deletions src/Filters/stream_filt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,9 @@ end

function setphase!(kernel::Union{FIRInterpolator, FIRRational}, ϕ::Real)
ϕ >= zero(ϕ) || throw(ArgumentError("ϕ must be >= 0"))
(ϕ, xThrowaway) = modf(ϕ)
kernel.inputDeficit += round(Int, xThrowaway)
kernel.ϕIdx = round(ϕ*(kernel.Nϕ) + 1.0)
xThrowaway, ϕIdx = divrem(round(Int, ϕ * kernel.Nϕ), kernel.Nϕ)
kernel.inputDeficit += xThrowaway
kernel.ϕIdx = ϕIdx + 1
nothing
end

Expand All @@ -229,7 +229,7 @@ function setphase!(kernel::FIRArbitrary, ϕ::Real)
(ϕ, xThrowaway) = modf(ϕ)
kernel.inputDeficit += round(Int, xThrowaway)
kernel.ϕAccumulator = ϕ*(kernel.Nϕ) + 1.0
kernel.ϕIdx = round(kernel.ϕAccumulator)
kernel.ϕIdx = floor(kernel.ϕAccumulator)
kernel.α = modf(kernel.ϕAccumulator)[1]
nothing
end
Expand Down
12 changes: 12 additions & 0 deletions test/filt_stream.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,3 +361,15 @@ end
test_rational(h, x, interpolation)
end
end

# check that these don't throw; the output should actually probably be longer
@test resample(1:2, 3, [zeros(2); 1; zeros(3)]) == [1, 0, 0, 2] # [1, 0, 0, 2, 0, 0]
@test resample(1:2, 3//2, [zeros(2); 1; zeros(3)]) == [1, 0] # [1, 0, 0]
let H = FIRFilter(2.22)
setphase!(H, 0.99)
@test length(filt(H, 1:2)) == 3
end
let H = FIRFilter(122.2)
setphase!(H, 0.99)
@test length(filt(H, 1:2)) == 124
end
Loading