ChebyshevDisk constructor works

Author: dlfivefifty

src/Disk/Disk.jl

@@ -4,17 +4,29 @@ struct ChebyshevDisk{V,T} <: Space{Disk{V},T}
     domain::Disk{V}
 end
 
-ChebyshevDisk(d::Disk{V}) where V = ChebyshevDisk{V,eltype(V)}(d)
+ChebyshevDisk(d::Disk{V}) where V = ChebyshevDisk{V,complex(eltype(V))}(d)
 ChebyshevDisk() = ChebyshevDisk(Disk())
 
 rectspace(_) = Chebyshev() * Laurent()
 
-
 function points(S::ChebyshevDisk, N)
     pts = points(rectspace(S), N)
-    fromcanonical.(Ref(S.domain), polar.(pts))
+    polar.(pts)
 end
 
+tensorizer(K::ChebyshevDisk) = Tensorizer((Ones{Int}(∞),Ones{Int}(∞)))
+
+# we have each polynomial
+blocklengths(K::ChebyshevDisk) = 1:∞
+
+for OP in (:block,:blockstart,:blockstop)
+    @eval begin
+        $OP(s::ChebyshevDisk,M::Block) = $OP(tensorizer(s),M)
+        $OP(s::ChebyshevDisk,M) = $OP(tensorizer(s),M)
+    end
+end
+
+
 plan_transform(S::ChebyshevDisk, n::AbstractVector) = 
     TransformPlan(S, plan_transform(rectspace(S),n), Val{false})
 plan_itransform(S::ChebyshevDisk, n::AbstractVector) = 
@@ -25,10 +37,8 @@ function checkerboard(A::AbstractMatrix{T}) where T
     m,n = size(A)
     C = zeros(T, (m+1)÷2, n)
     z = @view(A[1:2:end,1])
-    e1 = @view(A[1:2:end,4:4:end])
-    e2 = @view(A[1:2:end,5:4:end])
-    o1 = @view(A[2:2:end,2:4:end])
-    o2 = @view(A[2:2:end,3:4:end])
+    e1,e2 = @view(A[1:2:end,4:4:end]),@view(A[1:2:end,5:4:end])
+    o1,o2 = @view(A[2:2:end,2:4:end]),@view(A[2:2:end,3:4:end])
     C[1:size(z,1),1] .= z
     C[1:size(e1,1),4:4:n] .= e1
     C[1:size(e2,1),5:4:n] .= e2
@@ -40,13 +50,19 @@ end
 function icheckerboard(C::AbstractMatrix{T}) where T
     m,n = size(C)
     A = zeros(T, 2*m, n)
-    A[1:2:end,1:2:end] .= C[:,1:2:end]
-    A[2:2:end,2:2:end] .= C[:,2:2:end]
+    A[1:2:end,1] .= C[:,1]
+    A[1:2:end,4:4:end] .= C[:,4:4:end]
+    A[1:2:end,5:4:end] .= C[:,5:4:end]
+    A[2:2:end,2:4:end] .= C[:,2:4:end]
+    A[2:2:end,3:4:end] .= C[:,3:4:end]
     A
 end
 
-*(P::TransformPlan{<:Any,<:ChebyshevDisk}, v::AbstractArray) = checkerboard(P.plan*v)
-*(P::ITransformPlan{<:Any,<:ChebyshevDisk}, v::AbstractArray) = P.plan*icheckerboard(v)
+torectcfs(S, v) = fromtensor(rectspace(S), icheckerboard(totensor(S, v)))
+fromrectcfs(S, v) = fromtensor(S, checkerboard(totensor(rectspace(S),v)))
+
+*(P::TransformPlan{<:Any,<:ChebyshevDisk}, v::AbstractArray) = fromrectcfs(P.space, P.plan*v)
+*(P::ITransformPlan{<:Any,<:ChebyshevDisk}, v::AbstractArray) = P.plan*torectcfs(P.space, v)
 
-evaluate(cfs::AbstractVector, S::ChebyshevDisk, x) = evaluate(cfs, rectspace(S), ipolar(tocanonical(S.domain,x)))
+evaluate(cfs::AbstractVector, S::ChebyshevDisk, x) = evaluate(torectcfs(S,cfs), rectspace(S), ipolar(x))
 

src/MultivariateOrthogonalPolynomials.jl

@@ -58,6 +58,7 @@ import ApproxFunBase: Vec
 # Jacobi import
 import ApproxFunOrthogonalPolynomials: jacobip, JacobiSD, PolynomialSpace, order
 
+import ApproxFunFourier: polar, ipolar
 
 
 include("c_transforms.jl")

test/test_disk.jl

@@ -1,9 +1,11 @@
 using Revise, ApproxFun, MultivariateOrthogonalPolynomials
 import MultivariateOrthogonalPolynomials: checkerboard, icheckerboard
 
-f = (x,y) -> x*y+cos(y-0.1)+sin(x)+1; ff = Fun((r,θ) -> f(r*cos(θ),r*sin(θ)), (-1..1) × PeriodicSegment());
+f = (x,y) -> x*y+cos(y-0.1)+sin(x)+1; 
+ff = Fun(f, ChebyshevDisk(), 1000)
+@test ff(0.1,0.2) ≈ f(0.1,0.2)
 
-cfs = ApproxFunBase.coefficientmatrix(ff)
-icheckerboard(checkerboard(cfs))[1:size(cfs,1),:]
+ff = Fun(f, ChebyshevDisk())
+@test ff(0.1,0.2) ≈ f(0.1,0.2)
 
-cfs
+plot(ff)