Define the nufft() command, which just calls nufft1()

Author: ajt60gaibb

src/FastTransforms.jl

@@ -1,7 +1,7 @@
 __precompile__()
 module FastTransforms
 
-using Base, ToeplitzMatrices, Compat
+using Base, ToeplitzMatrices, Compat, LambertW
 
 import Base: *
 import Compat: view
@@ -11,8 +11,8 @@ export leg2cheb, cheb2leg, leg2chebu, ultra2ultra, jac2jac
 export gaunt
 export paduatransform, ipaduatransform, paduatransform!, ipaduatransform!, paduapoints
 export plan_paduatransform!, plan_ipaduatransform!
-export nufft, nufft1, nufft2, nufft3
-export nufft_plan nufft1_plan, nufft2_plan, nufft3_plan
+export nufft, nufft1, nufft2
+export nufft_plan, nufft1_plan, nufft2_plan
 
 # Other module methods and constants:
 #export ChebyshevJacobiPlan, jac2cheb, cheb2jac

src/nufft.jl

@@ -1,4 +1,3 @@
-
 function nufft1_plan{T<:AbstractFloat}( x::AbstractVector{T}, ϵ::T )
 (s_vec, t_idx, gam) = FindAlgorithmicParameters( x )
 K = FindK(gam, ϵ)   
@@ -15,19 +14,19 @@ In = speye(eltype(c),  N, N)
 p( c ) = (v.*(N*conj(ifft(In[:,t_idx]*conj(Diagonal(c)*u),1))))*ones(K)
 end
 
+
+nufft_plan{T<:AbstractFloat}( x::AbstractVectorP{T}, ϵ::T ) = nufft1_plan( x, ϵ )
+nufft{T<:AbstractFloat}( c::AbstractVector, x::AbstractVector{T}, ϵ::T ) = nufft_plan(x, ϵ)(c) 
 nufft1{T<:AbstractFloat}( c::AbstractVector, x::AbstractVector{T}, ϵ::T ) = nufft1_plan(x, ϵ)(c) 
 nufft2{T<:AbstractFloat}( c::AbstractVector, ω::AbstractVector{T}, ϵ::T ) = nufft2_plan(ω, ϵ)(c)
-nuftt3{T<:AbstractFloat}( c::AbstractVector, x::AbstractVector{T}, ω::AbstractVector{T}, ϵ::T ) = nufft3_plan(x, ω, ϵ)(c)
 
 FindK{T<:AbstractFloat}(γ::T, ϵ::T) = Int( ceil(5.0*γ.*exp(lambertw(log(10.0/ϵ)./γ/7.0))) )
 
 function FindAlgorithmicParameters{T<:AbstractFloat}( x::AbstractVector{T} )
-
 N = size(x, 1)
 s_vec = round(N*x)
 t_idx = mod(round(Int64, N*x), N) + 1
 γ = norm(N*x - s_vec, Inf)
-
 return (s_vec, t_idx, γ)
 end
 
@@ -39,14 +38,11 @@ N = size(x, 1)
 (s_vec, t_idx, γ) = FindAlgorithmicParameters( x ) 
 er = N*x - s_vec
 scl =  exp( -1im*pi*er )
-
 # Chebyshev polynomials of degree 0,...,K-1 evaluated at er/gam: 
 TT = Diagonal(scl)*ChebyshevP(K-1, er/γ)
-
 # Chebyshev expansion coefficients:
 cfs = Bessel_coeffs(K, γ) 
 u = zeros(eltype(cfs), N, K)
-
 # Construct them now: 
 for r = 0:K-1
 	for j = 1:N
@@ -56,19 +52,15 @@ for r = 0:K-1
 		end
 	end
 end
-
 # rowspace vectors:
 v = ChebyshevP(K-1, 2.0*collect(0:N-1)/N - ones(N) )
-
 return (u, v)
 end 
 
-
 function Bessel_coeffs(K::Int64, γ::Float64)
 # Calculate the Chebyshev coefficients of exp(-2*pi*1im*x*y) on [-gam,gam]x[0,1]
 
 cfs = complex(zeros( K, K ))
-
 arg = -γ*pi/2 
 for p = 0:K-1
  	for q = mod(p,2):2:K-1 
@@ -77,37 +69,30 @@ for p = 0:K-1
 end
 cfs[1,:] = cfs[1,:]/2.0
 cfs[:,1] = cfs[:,1]/2.0
-
 return cfs
-
 end
 
-
 function ChebyshevP{T<:AbstractFloat}(n::Int64, x::AbstractVector{T}) 
 # Evaluate Chebyshev polynomials of degree 0,...,n at x:
 
 N = size(x,1)
 Tcheb = zeros(eltype(x), N, n+1)
-
 # T_0(x) = 1.0
 for j = 1:N
 	Tcheb[j, 1] = 1.0
 end
-
 # T_1(x) = x 
 for k = 2:min(n+1,2)
 	for j = 1:N
 		Tcheb[j, 2] = x[j]
 	end
 end
-
 # 3-term recurrence relation: 
 twoX = 2.0*x
 for k = 2:n
 	for j = 1:N
     		Tcheb[j, k+1] = twoX[j]*Tcheb[j, k] - Tcheb[j, k-1]
 	end
 end
-
 return Tcheb
 end