Skip to content

Commit 5fb4b43

Browse files
platawiecPawel Latawiec
andauthored
Make minimum/maximum generic for Frequencies (#54)
Co-authored-by: Pawel Latawiec <pawel@metalenz.com>
1 parent 193d035 commit 5fb4b43

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

Project.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ julia = "^1.0"
1010

1111
[extras]
1212
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
13+
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
1314

1415
[targets]
15-
test = ["Test"]
16+
test = ["Test", "Unitful"]

src/definitions.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,8 +419,8 @@ Broadcast.broadcasted(::typeof(*), x::Number, f::Frequencies) = Broadcast.broadc
419419
Broadcast.broadcasted(::typeof(/), f::Frequencies, x::Number) = Frequencies(f.n_nonnegative, f.n, f.multiplier / x)
420420
Broadcast.broadcasted(::typeof(\), x::Number, f::Frequencies) = Broadcast.broadcasted(/, f, x)
421421

422-
Base.maximum(f::Frequencies) = (f.n_nonnegative - ifelse(f.multiplier >= 0, 1, f.n)) * f.multiplier
423-
Base.minimum(f::Frequencies) = (f.n_nonnegative - ifelse(f.multiplier >= 0, f.n, 1)) * f.multiplier
422+
Base.maximum(f::Frequencies{T}) where T = (f.n_nonnegative - ifelse(f.multiplier >= zero(T), 1, f.n)) * f.multiplier
423+
Base.minimum(f::Frequencies{T}) where T = (f.n_nonnegative - ifelse(f.multiplier >= zero(T), f.n, 1)) * f.multiplier
424424
Base.extrema(f::Frequencies) = (minimum(f), maximum(f))
425425

426426
"""

test/runtests.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ using AbstractFFTs: Plan
55
using LinearAlgebra
66
using Test
77

8+
import Unitful
9+
810
@testset "rfft sizes" begin
911
A = rand(11, 10)
1012
@test @inferred(AbstractFFTs.rfft_output_size(A, 1)) == (6, 10)
@@ -131,7 +133,7 @@ end
131133
@test f(freqs) == f(collect(freqs)) == f(fftshift(freqs))
132134
end
133135
end
134-
for f in (fftfreq, rfftfreq), n in (8, 9), multiplier in (2, 1/3, -1/7)
136+
for f in (fftfreq, rfftfreq), n in (8, 9), multiplier in (2, 1/3, -1/7, 1.0*Unitful.mm)
135137
freqs = f(n, multiplier)
136138
check_extrema(freqs)
137139
end

0 commit comments

Comments
 (0)