Merge branch 'master' into feat-triangular-harmonics

Author: MikaelSlevinsky

.travis.yml

@@ -4,7 +4,6 @@ os:
   - linux
   - osx
 julia:
-  - 0.5
   - 0.6
   - nightly
 matrix:

REQUIRE

@@ -1,6 +1,7 @@
-julia 0.5
+julia 0.6
 ToeplitzMatrices 0.2
 HierarchicalMatrices 0.0.2
 LowRankApprox 0.0.2
 ProgressMeter 0.3.4
+SpecialFunctions 0.3.4
 Compat 0.17

appveyor.yml

@@ -1,7 +1,5 @@
 environment:
   matrix:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
   - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
   - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"

src/ChebyshevJacobiPlan.jl

@@ -1,4 +1,4 @@
-immutable ChebyshevJacobiConstants{D,T}
+struct ChebyshevJacobiConstants{D,T}
     α::T
     β::T
     M::Int
@@ -23,7 +23,7 @@ function ChebyshevJacobiConstants{T}(c::AbstractVector{T},α::T,β::T;M::Int=7,D
     ChebyshevJacobiConstants{D,T}(α,β,M,N,nM₀,αN,K)
 end
 
-immutable ChebyshevJacobiIndices
+struct ChebyshevJacobiIndices
     i₁::Vector{Int}
     i₂::Vector{Int}
     j₁::Vector{Int}
@@ -53,7 +53,7 @@ function ChebyshevJacobiIndices{D,T}(α::T,β::T,CJC::ChebyshevJacobiConstants{D
     ChebyshevJacobiIndices(i₁,i₂,j₁,j₂)
 end
 
-type ChebyshevJacobiPlan{D,T,DCT,DST,SA} <: FastTransformPlan{D,T}
+mutable struct ChebyshevJacobiPlan{D,T,DCT,DST,SA} <: FastTransformPlan{D,T}
     CJC::ChebyshevJacobiConstants{D,T}
     CJI::ChebyshevJacobiIndices
     p₁::DCT
@@ -142,7 +142,7 @@ function ForwardChebyshevJacobiPlan{T}(c_jac::AbstractVector{T},α::T,β::T,M::I
     @inbounds for i=1:N+1 tempcosβsinα[i] = tempcos[i]^(β+1/2)*tempsin[i]^(α+1/2) end
 
     # Initialize normalizing constant
-    cnαβ = Cnαβ(0:N,α,β)
+    cnαβ = Cnαβ.(0:N,α,β)
     cnmαβ = zero(cnαβ)
 
     # Get indices
@@ -184,11 +184,11 @@ function BackwardChebyshevJacobiPlan{T}(c_cheb::AbstractVector{T},α::T,β::T,M:
     @inbounds for i=1:2N+1 tempcosβsinα[i] = tempcos[i]^(β+1/2)*tempsin[i]^(α+1/2) end
 
     # Initialize normalizing constant
-    cnαβ = Cnαβ(0:2N,α,β)
+    cnαβ = Cnαβ.(0:2N,α,β)
     cnmαβ = zero(cnαβ)
 
     # Initialize orthonormality constants
-    anαβ = Anαβ(0:N,α,β)
+    anαβ = Anαβ.(0:N,α,β)
 
     # Get indices
     CJI = ChebyshevJacobiIndices(α,β,CJC,tempmindices,cfs,tempcos,tempsin,tempcosβsinα)

src/ChebyshevUltrasphericalPlan.jl

@@ -1,4 +1,4 @@
-immutable ChebyshevUltrasphericalConstants{D,T}
+struct ChebyshevUltrasphericalConstants{D,T}
     λ::T
     M::Int
     N::Int
@@ -23,7 +23,7 @@ function ChebyshevUltrasphericalConstants{T}(c::AbstractVector{T},λ::T;M::Int=7
     ChebyshevUltrasphericalConstants{D,T}(λ,M,N,nM₀,αN,K)
 end
 
-immutable ChebyshevUltrasphericalIndices
+struct ChebyshevUltrasphericalIndices
     i₁::Vector{Int}
     i₂::Vector{Int}
     j₁::Vector{Int}
@@ -53,7 +53,7 @@ function ChebyshevUltrasphericalIndices{D,T}(λ::T,CUC::ChebyshevUltrasphericalC
     ChebyshevUltrasphericalIndices(i₁,i₂,j₁,j₂)
 end
 
-type ChebyshevUltrasphericalPlan{D,T,DCT,DST,SA} <: FastTransformPlan{D,T}
+mutable struct ChebyshevUltrasphericalPlan{D,T,DCT,DST,SA} <: FastTransformPlan{D,T}
     CUC::ChebyshevUltrasphericalConstants{D,T}
     CUI::ChebyshevUltrasphericalIndices
     p₁::DCT
@@ -184,7 +184,7 @@ function BackwardChebyshevUltrasphericalPlan{T}(c_ultra::AbstractVector{T},λ::T
     cnmλ = similar(cnλ)
 
     # Initialize orthonormality constants
-    anλ = Anαβ(0:N,λ-half(λ),λ-half(λ))
+    anλ = Anαβ.(0:N,λ-half(λ),λ-half(λ))
 
     # Get indices
     CUI = ChebyshevUltrasphericalIndices(λ,CUC,tempmindices,tempsin,tempsinλ)

src/FastTransforms.jl

@@ -1,14 +1,27 @@
 __precompile__()
 module FastTransforms
 
-using Base, ToeplitzMatrices, HierarchicalMatrices, LowRankApprox, ProgressMeter, Compat
+using ToeplitzMatrices, HierarchicalMatrices, LowRankApprox, ProgressMeter, Compat,
+        AbstractFFTs, SpecialFunctions
+
+if VERSION < v"0.7-"
+    using Base.FFTW
+    import Base.FFTW: r2rFFTWPlan, unsafe_execute!, fftwSingle, fftwDouble, fftwNumber
+    import Base.FFTW: libfftw, libfftwf, PlanPtr, r2rFFTWPlan
+else
+    using FFTW
+    import FFTW: r2rFFTWPlan, unsafe_execute!, fftwSingle, fftwDouble, fftwNumber
+    import FFTW: libfftw, libfftwf, PlanPtr, r2rFFTWPlan
+end
 
 import Base: *, \, size, view
 import Base: getindex, setindex!, Factorization, length
 import Base.LinAlg: BlasFloat, BlasInt
 import HierarchicalMatrices: HierarchicalMatrix, unsafe_broadcasttimes!
 import HierarchicalMatrices: A_mul_B!, At_mul_B!, Ac_mul_B!
 import LowRankApprox: ColPerm
+import AbstractFFTs: Plan
+
 
 export cjt, icjt, jjt, plan_cjt, plan_icjt
 export leg2cheb, cheb2leg, leg2chebu, ultra2ultra, jac2jac
@@ -49,7 +62,7 @@ include("fejer.jl")
 include("recurrence.jl")
 include("PaduaTransform.jl")
 
-@compat abstract type FastTransformPlan{D,T} end
+abstract type FastTransformPlan{D,T} end
 
 include("ChebyshevJacobiPlan.jl")
 include("jac2cheb.jl")

src/PaduaTransform.jl

@@ -2,7 +2,7 @@ doc"""
 Pre-plan an Inverse Padua Transform.
 """
 # lex indicates if its lexigraphical (i.e., x, y) or reverse (y, x)
-immutable IPaduaTransformPlan{lex,IDCTPLAN,T}
+struct IPaduaTransformPlan{lex,IDCTPLAN,T}
     cfsmat::Matrix{T}
     idctplan::IDCTPLAN
 end
@@ -103,7 +103,7 @@ end
 doc"""
 Pre-plan a Padua Transform.
 """
-immutable PaduaTransformPlan{lex,DCTPLAN,T}
+struct PaduaTransformPlan{lex,DCTPLAN,T}
     vals::Matrix{T}
     dctplan::DCTPLAN
 end

src/SphericalHarmonics/Butterfly.jl

@@ -1,4 +1,4 @@
-immutable Butterfly{T} <: Factorization{T}
+struct Butterfly{T} <: Factorization{T}
     columns::Vector{Matrix{T}}
     factors::Vector{Vector{IDPackedV{T}}}
     permutations::Vector{Vector{ColumnPermutation}}
@@ -60,7 +60,7 @@ function Butterfly{T}(A::AbstractMatrix{T}, L::Int; isorthogonal::Bool = false,
         end
         permutations[1][j] = factors[1][j][:P]
         indices[1][j+1] = indices[1][j] + size(factors[1][j], 1)
-        cs[1][j] = factors[1][j].sk+nl-1
+        cs[1][j] = factors[1][j].sk .+ nl .- 1
     end
 
     ii, jj = 2, (tL>>1)
@@ -276,7 +276,7 @@ function A_mul_B_col_J!{T}(u::VecOrMat{T}, B::Butterfly{T}, b::VecOrMat{T}, J::I
 end
 
 for f! in (:At_mul_B!,:Ac_mul_B!)
-    f_col_J! = parse(string(f!)[1:end-1]*"_col_J!")
+    f_col_J! = Meta.parse(string(f!)[1:end-1]*"_col_J!")
     @eval begin
         function $f_col_J!{T}(u::VecOrMat{T}, B::Butterfly{T}, b::VecOrMat{T}, J::Int)
             L = length(B.factors) - 1

src/SphericalHarmonics/fastplan.jl

@@ -1,4 +1,4 @@
-immutable FastSphericalHarmonicPlan{T} <: SphericalHarmonicPlan{T}
+struct FastSphericalHarmonicPlan{T} <: SphericalHarmonicPlan{T}
     RP::RotationPlan{T}
     BF::Vector{Butterfly{T}}
     p1::NormalizedLegendreToChebyshevPlan{T}

src/SphericalHarmonics/slowplan.jl

@@ -41,7 +41,7 @@ function A_mul_B!{T<:Real}(A::AbstractMatrix, G::Givens{T})
     return A
 end
 
-immutable Pnmp2toPlm{T} <: AbstractRotation{T}
+struct Pnmp2toPlm{T} <: AbstractRotation{T}
     rotations::Vector{Givens{T}}
 end
 
@@ -73,7 +73,7 @@ function Base.A_mul_B!(A::AbstractMatrix, C::Pnmp2toPlm)
 end
 
 
-immutable RotationPlan{T} <: AbstractRotation{T}
+struct RotationPlan{T} <: AbstractRotation{T}
     layers::Vector{Pnmp2toPlm{T}}
 end
 
@@ -126,7 +126,7 @@ end
 Base.Ac_mul_B!(P::RotationPlan, A::AbstractMatrix) = At_mul_B!(P, A)
 
 
-immutable SlowSphericalHarmonicPlan{T} <: SphericalHarmonicPlan{T}
+struct SlowSphericalHarmonicPlan{T} <: SphericalHarmonicPlan{T}
     RP::RotationPlan{T}
     p1::NormalizedLegendreToChebyshevPlan{T}
     p2::NormalizedLegendre1ToChebyshev2Plan{T}