Merge pull request #40 from mcabbott/shift

Use tuples in fftshift, and add copy method

Author: stevengj

src/definitions.jl

@@ -346,8 +346,6 @@ plan_irfft
 
 ##############################################################################
 
-fftshift(x) = circshift(x, div.([size(x)...],2))
-
 """
     fftshift(x, [dim])
 
@@ -363,16 +361,11 @@ If `dim` is not given then the signal is shifted along each dimension.
 """
 fftshift
 
-function fftshift(x,dim)
-    s = zeros(Int,ndims(x))
-    for i in dim
-        s[i] = div(size(x,i),2)
-    end
+function fftshift(x, dim = 1:ndims(x))
+    s = ntuple(d -> d in dim ? div(size(x,d),2) : 0, ndims(x))
     circshift(x, s)
 end
 
-ifftshift(x) = circshift(x, div.([size(x)...],-2))
-
 """
     ifftshift(x, [dim])
 
@@ -388,11 +381,8 @@ If `dim` is not given then the signal is shifted along each dimension.
 """
 ifftshift
 
-function ifftshift(x,dim)
-    s = zeros(Int,ndims(x))
-    for i in dim
-        s[i] = -div(size(x,i),2)
-    end
+function ifftshift(x, dim = 1:ndims(x))
+    s = ntuple(d -> d in dim ? -div(size(x,d),2) : 0, ndims(x))
     circshift(x, s)
 end
 
@@ -423,6 +413,8 @@ end
 Base.size(x::Frequencies) = (x.n,)
 Base.step(x::Frequencies) = x.multiplier
 
+Base.copy(x::Frequencies) = x
+
 """
     fftfreq(n, fs=1)
 Return the discrete Fourier transform (DFT) sample frequencies for a DFT of length `n`. The returned

test/runtests.jl

@@ -82,6 +82,9 @@ end
 end
 
 @testset "FFT Frequencies" begin
+    @test fftfreq(8) isa Frequencies
+    @test copy(fftfreq(8)) isa Frequencies
+
     # N even
     @test fftfreq(8) == [0.0, 0.125, 0.25, 0.375, -0.5, -0.375, -0.25, -0.125]
     @test rfftfreq(8) == [0.0, 0.125, 0.25, 0.375, 0.5]