Dl/newfasttransforms (#8)

* Fixes for new FastTransforms

* Update test_dirichlettriangle.jl

Author: dlfivefifty

Project.toml

@@ -9,6 +9,7 @@ ApproxFunFourier = "59844689-9c9d-51bf-9583-5b794ec66d30"
 ApproxFunOrthogonalPolynomials = "b70543e2-c0d9-56b8-a290-0d4d6d4de211"
 BandedMatrices = "aae01518-5342-5314-be14-df237901396f"
 BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
+BlockBandedMatrices = "ffab5731-97b5-5995-9138-79e8c1846df0"
 DomainSets = "5b8099bc-c8ec-5219-889f-1d9e522a28bf"
 FastGaussQuadrature = "442a2c76-b920-505d-bb47-c5924d526838"
 FastTransforms = "057dd010-8810-581a-b7be-e3fc3b93f78c"
@@ -29,17 +30,19 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
 ApproxFun = "0.11"
-ApproxFunOrthogonalPolynomials = "0.2"
-ApproxFunBase = "0.1"
-BandedMatrices = "0.10"
-BlockArrays = "0.9"
+ApproxFunFourier = "0.2"
+ApproxFunOrthogonalPolynomials = "0.3"
+ApproxFunBase = "0.2.3"
+BandedMatrices = "0.14"
+BlockArrays = "0.10"
+BlockBandedMatrices = "0.6"
 DomainSets = "0.1"
-FastGaussQuadrature = "0.3"
-FastTransforms = "0.5"
-FillArrays = "0.6"
-InfiniteArrays = "0.1"
-LazyArrays = "0.10"
+FastGaussQuadrature = "0.4"
+FastTransforms = "0.8"
+FillArrays = "0.8"
+InfiniteArrays = "0.5"
+LazyArrays = "0.14"
 RecipesBase = "0.5, 0.6, 0.7"
-SpecialFunctions = "0.6, 0.7"
-StaticArrays = "0.11"
-julia = "1"
+SpecialFunctions = "0.7, 0.8, 0.9"
+StaticArrays = "0.11, 0.12"
+julia = "1.3"

src/MultivariateOrthogonalPolynomials.jl

@@ -1,5 +1,5 @@
 module MultivariateOrthogonalPolynomials
-using Base, RecipesBase, ApproxFun, BandedMatrices, BlockArrays,
+using Base, RecipesBase, ApproxFun, BandedMatrices, BlockArrays, BlockBandedMatrices,
     FastTransforms, FastGaussQuadrature, StaticArrays, FillArrays,
     LinearAlgebra, Libdl, SpecialFunctions, LazyArrays, InfiniteArrays,
     DomainSets
@@ -11,7 +11,9 @@ import Base: values,getindex,setindex!,*, +, -, ==,<,<=,>,
 
 import BandedMatrices: inbands_getindex, inbands_setindex!
 
-import BlockArrays: blocksizes, BlockSizes, getblock, global2blockindex
+import BlockArrays: blocksizes, BlockSizes, getblock, global2blockindex, Block
+
+import BlockBandedMatrices: blockbandwidths, subblockbandwidths
 
 # ApproxFun general import
 import ApproxFunBase: BandedMatrix, blocksize,
@@ -46,9 +48,9 @@ import ApproxFunBase:   ConstantSpace, NoSpace, prectype,
 # Multivariate import
 import ApproxFunBase: DirectSumSpace, AbstractProductSpace, factor,
                     BivariateFun,  ProductFun, LowRankFun, lap, columnspace,
-                    blockbandwidths, subblockbandwidths, fromtensor, totensor, isbandedblockbanded,
+                    fromtensor, totensor, isbandedblockbanded,
                     Tensorizer, tensorizer, block, blockstart, blockstop, blocklengths,
-                    domaintensorizer, rangetensorizer, blockrange, Block, BlockRange1,
+                    domaintensorizer, rangetensorizer, blockrange, BlockRange1,
                     float
 
 # Singularities
@@ -63,8 +65,6 @@ import ApproxFunOrthogonalPolynomials: jacobip, JacobiSD, PolynomialSpace, order
 import ApproxFunFourier: polar, ipolar
 
 
-include("c_transforms.jl")
-
 include("Triangle/Triangle.jl")
 include("Disk/Disk.jl")
 include("Cone/Cone.jl")

src/Triangle/Triangle.jl

@@ -158,7 +158,7 @@ jacobinorm(n,a,b) = if n ≠ 0
 #
 #
 
-
+lgamma(x) = logabsgamma(x)[1]
 
 function trinorm(n,k,a,b,c)
     if a == 0 && b == c == -0.5
@@ -231,7 +231,7 @@ function FastJacobiTriangleTransformPlan(S::JacobiTriangle, v::AbstractVector{T}
     n = floor(Integer,sqrt(2length(v)) + 1/2)
     v = Array{T}(undef, sum(1:n))
     FastJacobiTriangleTransformPlan(plan_transform(DuffyTriangle(), v),
-                                     CTri2ChebPlan(n,S.α,S.β,S.γ),S.α,S.β,S.γ)
+                                     plan_tri2cheb(Float64,n,S.α,S.β,S.γ),S.α,S.β,S.γ)
 end
 
 function *(P::FastJacobiTriangleTransformPlan, v)
@@ -280,7 +280,7 @@ function FastJacobiTriangleITransformPlan(S::JacobiTriangle, v::AbstractVector{T
     n = floor(Integer,sqrt(2length(v)) + 1/2)
     v = Array{T}(undef, sum(1:n))
     FastJacobiTriangleITransformPlan(plan_itransform(DuffyTriangle(), v),
-                                   CTri2ChebPlan(n,S.α,S.β,S.γ),S.α,S.β,S.γ)
+                                   plan_tri2cheb(Float64,n,S.α,S.β,S.γ),S.α,S.β,S.γ)
 end
 
 function *(P::FastJacobiTriangleITransformPlan, v)

src/c_transforms.jl

@@ -1,7 +1,7 @@
 using ApproxFun, MultivariateOrthogonalPolynomials, Test, StaticArrays
-    import MultivariateOrthogonalPolynomials: DirichletTriangle
-    import ApproxFun: testbandedblockbandedoperator, testblockbandedoperator, Vec
-    x,y=0.1,0.2
+import MultivariateOrthogonalPolynomials: DirichletTriangle
+import ApproxFunBase: testbandedblockbandedoperator, testblockbandedoperator, Vec
+x,y=0.1,0.2
 
 
 @testset "Dirchlet conversions" begin

test/test_dirichlettriangle.jl

@@ -1,12 +1,12 @@
-using StaticArrays, BandedMatrices, FastTransforms,
+using StaticArrays, BandedMatrices, BlockArrays, FastTransforms,
         ApproxFunBase, ApproxFunOrthogonalPolynomials, ApproxFun, 
         MultivariateOrthogonalPolynomials, LinearAlgebra, Test
 import MultivariateOrthogonalPolynomials: Lowering, DuffyTriangle,
                         clenshaw, block, TriangleWeight,plan_evaluate, weight
 import ApproxFunBase: testbandedblockbandedoperator, Block, BandedBlockBandedMatrix, blockcolrange, blocksize,
                 Vec, plan_transform
 import ApproxFunOrthogonalPolynomials: jacobip                
-
+import BandedMatrices: colstop
 
 @testset "Triangle domain" begin
     d = Triangle()
@@ -137,10 +137,10 @@ end
 
     @test Jy[3,1] ≈ 1/3
 
-    @test ApproxFun.colstop(Jy,1) == 3
-    @test ApproxFun.colstop(Jy,2) == 5
-    @test ApproxFun.colstop(Jy,3) == 6
-    @test ApproxFun.colstop(Jy,4) == 8
+    @test colstop(Jy,1) == 3
+    @test colstop(Jy,2) == 5
+    @test colstop(Jy,3) == 6
+    @test colstop(Jy,4) == 8
 
 
     @test (Jy*f)(0.1,0.2) ≈ 0.2exp(0.1*cos(0.2))