Skip to content

Commit 41f58b5

Browse files
committed
Display Frequencies constructor
1 parent f1562d5 commit 41f58b5

File tree

2 files changed

+6
-20
lines changed

2 files changed

+6
-20
lines changed

src/definitions.jl

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -462,13 +462,8 @@ Base.maximum(f::Frequencies{T}) where T = (f.n_nonnegative - ifelse(f.multiplier
462462
Base.minimum(f::Frequencies{T}) where T = (f.n_nonnegative - ifelse(f.multiplier >= zero(T), f.n, 1)) * f.multiplier
463463
Base.extrema(f::Frequencies) = (minimum(f), maximum(f))
464464

465-
function Base.show(io::IO, f::Frequencies)
466-
r1 = 0:f.n_nonnegative-1
467-
r2 = -f.n + f.n_nonnegative:-1
468-
print(io, "[", r1, ";")
469-
!isempty(r2) && print(io, " ", r2)
470-
print(io, "]*", step(f))
471-
return nothing
465+
function show(io::IO, f::Frequencies)
466+
print(io, Frequencies, "(", f.n_nonnegative, ", ", f.n, ", ", f.multiplier, ")")
472467
end
473468

474469
"""

test/runtests.jl

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -110,19 +110,10 @@ end
110110
end
111111

112112
@testset "show" begin
113-
for f in Any[fftfreq(6), fftfreq(7, 2), rfftfreq(5, 0.3), rfftfreq(4, 3)]
114-
fnn = f.n_nonnegative
115-
r1 = 0:fnn - 1
116-
r2 = -length(f) + fnn:-1
117-
v = [r1; r2] * step(f)
118-
@test v f
119-
s = repr(f)
120-
if !isempty(r2) # fftfreq
121-
@test s == "[$r1; $r2]*$(step(f))"
122-
else # rfftfreq
123-
@test s == "[$r1;]*$(step(f))"
124-
end
125-
end
113+
@test repr(fftfreq(6)) == "Frequencies(3, 6, $(1/6))"
114+
@test repr(fftfreq(7, 2)) == "Frequencies(4, 7, $(2/7))"
115+
@test repr(rfftfreq(5, 0.3)) == "Frequencies(3, 3, $(0.3/5))"
116+
@test repr(rfftfreq(4, 3)) == "Frequencies(3, 3, $(3/4))"
126117
end
127118
end
128119

0 commit comments

Comments
 (0)