fix nufft tests

Author: MikaelSlevinsky

src/nufft.jl

@@ -301,7 +301,7 @@ F_{i,j} = \sum_{k=0}^{M-1}\sum_{\ell=0}^{N-1} C_{k,\ell} e^{-2\pi{\rm i} (x_i k
 nufft2{T<:AbstractFloat}(C::Matrix, x::AbstractVector{T}, y::AbstractVector{T}, ϵ::T) = plan_nufft2(x, y, ϵ)*C
 
 
-FindK{T<:AbstractFloat}(γ::T, ϵ::T) = γ < ϵ ? 1 : Int(ceil(5*γ*exp(lambertw(log(10/ϵ)/γ/7))))
+FindK{T<:AbstractFloat}(γ::T, ϵ::T) = γ ≤ ϵ ? 1 : Int(ceil(5*γ*exp(lambertw(log(10/ϵ)/γ/7))))
 AssignClosestEquispacedGridpoint{T<:AbstractFloat}(x::AbstractVector{T})::AbstractVector{T} = round.([Int], size(x, 1)*x)
 AssignClosestEquispacedFFTpoint{T<:AbstractFloat}(x::AbstractVector{T})::Array{Int,1} = mod.(round.([Int], size(x, 1)*x), size(x, 1)) + 1
 PerturbationParameter{T<:AbstractFloat}(x::AbstractVector{T}, s_vec::AbstractVector{T})::AbstractFloat = norm(size(x, 1)*x - s_vec, Inf)

test/nuffttests.jl

@@ -43,7 +43,7 @@ using FastTransforms, Base.Test
 
     N = round.([Int],logspace(1,3,10))
 
-    for n in N, ϵ in (1e-4,1e-8,1e-12,eps(Float64))
+    for n in N, ϵ in (1e-4, 1e-8, 1e-12, eps(Float64))
         c = complex(rand(n))
         err_bnd = 500*ϵ*n*norm(c)
 
@@ -69,16 +69,15 @@ using FastTransforms, Base.Test
     end
 
     # Check that if points/frequencies are indeed uniform, then it's equal to the fft.
-
-    n = 1000
-    c = complex(rand(n))
-    ω = collect(0.0:n-1)
-    x = ω/n
-    fftc = fft(c)
-    @test norm(nufft1(c, ω, eps()) - fftc) == 0
-    @test norm(nufft2(c, x, eps()) - fftc) == 0
-    @test norm(nufft3(c, x, ω, eps()) - fftc) == 0
-
+    for n in (1000,), ϵ in (eps(Float64), 0.0)
+        c = complex(rand(n))
+        ω = collect(0.0:n-1)
+        x = ω/n
+        fftc = fft(c)
+        @test norm(nufft1(c, ω, ϵ) - fftc) == 0
+        @test norm(nufft2(c, x, ϵ) - fftc) == 0
+        @test norm(nufft3(c, x, ω, ϵ) - fftc) == 0
+    end
 
     function nudft1{T<:AbstractFloat}(C::Matrix{Complex{T}}, ω1::AbstractVector{T}, ω2::AbstractVector{T})
         # Nonuniform discrete Fourier transform of type I-I