Revert "Use broadcast for special functions"

This reverts commit 84c086a.

Author: dlfivefifty

src/FastTransforms.jl

@@ -3,7 +3,8 @@ module FastTransforms
 
 using Base, ToeplitzMatrices
 
-import Base: *, view, broadcast
+import Base: *
+import Base: view
 
 export cjt, icjt, jjt, plan_cjt, plan_icjt
 export leg2cheb, cheb2leg, leg2chebu, ultra2ultra, jac2jac

src/specialfunctions.jl

@@ -165,11 +165,12 @@ function Λ(x::Float64,λ₁::Float64,λ₂::Float64)
         (x+λ₂)/(x+λ₁)*Λ(x+1.,λ₁,λ₂)
     end
 end
+Λ{T<:Number}(x::AbstractArray{T},λ₁::Number,λ₂::Number) = promote_type(T,typeof(λ₁),typeof(λ₂))[ Λ(x[i],λ₁,λ₂) for i in eachindex(x) ]
 
 
 Cnλ(n::Integer,λ::Float64) = 2^λ/sqrtpi*Λ(n+λ)
 Cnλ(n::Integer,λ::Number) = 2^λ/sqrt(oftype(λ,π))*Λ(n+λ)
-function broadcast{T<:Integer}(::typeof(Cnλ),n::UnitRange{T},λ::Number)
+function Cnλ{T<:Integer}(n::UnitRange{T},λ::Number)
     ret = Vector{typeof(λ)}(length(n))
     ret[1] = Cnλ(first(n),λ)
     for i=2:length(n)
@@ -178,6 +179,9 @@ function broadcast{T<:Integer}(::typeof(Cnλ),n::UnitRange{T},λ::Number)
     ret
 end
 
+Cnλ{T<:Integer}(n::AbstractVector{T},λ::Number) = [ Cnλ(n[i],λ) for i=1:length(n) ]
+Cnλ{T<:Integer}(n::AbstractMatrix{T},λ::Number) = [ Cnλ(n[i,j],λ) for i=1:size(n,1), j=1:size(n,2) ]
+
 function Cnmλ(n::Integer,m::Integer,λ::Number)
     if m == 0
         Cnλ(n,λ)
@@ -186,6 +190,9 @@ function Cnmλ(n::Integer,m::Integer,λ::Number)
     end
 end
 
+Cnmλ{T<:Integer}(n::AbstractVector{T},m::Integer,λ::Number) = [ Cnmλ(n[i],m,λ) for i=1:length(n) ]
+
+
 function Cnαβ(n::Integer,α::Number,β::Number)
     if n==0
         2^(α+β+1)*beta(α+1,β+1)/π
@@ -206,6 +213,9 @@ function Cnαβ(n::Integer,α::Float64,β::Float64)
     end
 end
 
+Cnαβ{T<:Integer}(n::AbstractVector{T},α::Number,β::Number) = [ Cnαβ(n[i],α,β) for i=1:length(n) ]
+Cnαβ{T<:Integer}(n::AbstractMatrix{T},α::Number,β::Number) = [ Cnαβ(n[i,j],α,β) for i=1:size(n,1), j=1:size(n,2) ]
+
 function Cnmαβ(n::Integer,m::Integer,α::Number,β::Number)
     if m == 0
         Cnαβ(n,α,β)
@@ -214,6 +224,15 @@ function Cnmαβ(n::Integer,m::Integer,α::Number,β::Number)
     end
 end
 
+Cnmαβ{T<:Integer}(n::AbstractVector{T},m::Integer,α::Number,β::Number) = [ Cnmαβ(n[i],m,α,β) for i=1:length(n) ]
+Cnmαβ{T<:Integer}(n::AbstractMatrix{T},m::Integer,α::Number,β::Number) = [ Cnmαβ(n[i,j],m,α,β) for i=1:size(n,1), j=1:size(n,2) ]
+
+function Cnmαβ{T<:Number}(n::Integer,m::Integer,α::AbstractArray{T},β::AbstractArray{T})
+    shp = promote_shape(size(α),size(β))
+    reshape([ Cnmαβ(n,m,α[i],β[i]) for i in eachindex(α,β) ], shp)
+end
+
+
 function absf(α::Number,β::Number,m::Int,θ::Number)
     ret = zero(θ)
     for l=0:m
@@ -222,7 +241,12 @@ function absf(α::Number,β::Number,m::Int,θ::Number)
     ret
 end
 
-function broadcast{T<:Number}(::typeof(absf),α::Number,β::Number,m::Int,θ::AbstractArray{T,1})
+function absf{T<:Number}(α::AbstractArray{T},β::AbstractArray{T},m::Int,θ::Number)
+    shp = promote_shape(size(α),size(β))
+    reshape([ absf(α[i],β[i],m,θ) for i in eachindex(α,β) ], shp)
+end
+
+function absf{T<:Number}(α::Number,β::Number,m::Int,θ::AbstractArray{T,1})
     ret = zero(θ)
     cfs = zeros(T,m+1)
     for l=0:m
@@ -233,6 +257,8 @@ function broadcast{T<:Number}(::typeof(absf),α::Number,β::Number,m::Int,θ::Ab
     end
     ret
 end
+absf{T<:Number}(α::Number,β::Number,m::Int,θ::AbstractArray{T,2}) = [ absf(α,β,m,θ[i,j]) for i=1:size(θ,1), j=1:size(θ,2) ]
+absf{T<:Number}(α::Number,β::Number,m::Int,θ::AbstractArray{T}) = reshape([ absf(α,β,m,θ[i]) for i in eachindex(θ) ], size(θ))
 
 function compute_absf!{T<:AbstractFloat}(ret::Vector{T},cfs::Matrix{T},α::T,β::T,tempcos::Vector{T},tempsin::Vector{T},tempcosβsinα::Vector{T},m::Int)
     @inbounds for i=1:length(ret)

test/runtests.jl

@@ -4,8 +4,8 @@ using Base.Test
 println("Testing special functions")
 n = 0:1000_000
 λ = 0.123
-@time FastTransforms.Cnλ.(n,λ);
-@time FastTransforms.Cnλ.(n,λ);
+@time FastTransforms.Cnλ(n,λ);
+@time FastTransforms.Cnλ(n,λ);
 
 x = linspace(0,20,81);
 @test norm((FastTransforms.Λ.(x)-FastTransforms.Λ.(big.(x)))./FastTransforms.Λ.(big.(x)),Inf) < 2eps()
@@ -57,7 +57,7 @@ v = zeros(Nr)
 Na,Nb = 5,5
 V = zeros(Na,Nb)
 
-for N in round.([Int],logspace(1,3,3))
+for N in round.(Int,logspace(1,3,3))
     println("")
     println("N = ",N)
     println("")