Use Disk from DomainSets (#87)

Author: jishnub

Project.toml

@@ -1,6 +1,6 @@
 name = "ApproxFunFourier"
 uuid = "59844689-9c9d-51bf-9583-5b794ec66d30"
-version = "0.3.17"
+version = "0.3.18"
 
 [deps]
 AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"

src/ApproxFunFourier.jl

@@ -39,6 +39,7 @@ import ApproxFunBase: Fun, SumSpace, SubSpace, NoSpace, IntervalOrSegment,
 
 import BandedMatrices: bandwidths
 
+using DomainSets
 import DomainSets: Domain, indomain, UnionDomain, Point, Interval,
             boundary, rightendpoint, leftendpoint, endpoints
 

src/Domains/Disk.jl

@@ -1,45 +1,24 @@
 export Disk,𝔻
 
-# T is Real or Complex
-# TT is (Real,Real) or Complex
-"""
-    Disk(c,r)
-
-represents the disk centred at `c` with radius `r`.
-"""
-struct Disk{T} <: Domain{T}
-    center::T
-    radius::Float64
-end
-
-Disk(c,r) = Disk{typeof(c)}(c,r)
-Disk(c::Real,r) = Disk(complex(c),r)
-Disk(c::Integer,r) = Disk(float(c),r)
-Disk(c::Complex{<:Integer},r) = Disk(float(c),r)
-
-Disk() = Disk(SVector(0.,0.),1.)
-Disk(::AnyDomain) = Disk(NaN,(NaN,NaN))
+DomainSets.Disk(::AnyDomain) = Disk(NaN,(NaN,NaN))
 
 const 𝔻 = Disk()
 
-isambiguous(d::Disk) = isnan(d.radius) && all(isnan,d.center)
+isambiguous(d::Disk) = isnan(radius(d)) && all(isnan, center(d))
 
 polar(r,θ) = SVector(r*cos(θ),r*sin(θ))
 ipolar(x,y) = SVector(sqrt(abs2(x)+abs2(y)), atan(y,x))
 polar(rθ::SVector) = polar(rθ...)
 ipolar(xy::SVector) = ipolar(xy...)
 
-fromcanonical(D::Disk{T},xy::SVector) where {T<:SVector} = SVector((D.radius.*xy .+ D.center)...)
-tocanonical(D::Disk{T},x,y) where {T<:SVector} = SVector((xy .- D.center)./D.radius)
+fromcanonical(D::Disk, xy) = radius(D).*xy .+ center(D)
+tocanonical(D::Disk, xy) = (xy .- center(D))./radius(D)
 
-checkpoints(d::Disk) = [fromcanonical(d,SVector(.1,.2243)),fromcanonical(d,SVector(-.212423,-.3))]
+checkpoints(d::Disk) = SVector{2}(fromcanonical(d,SVector(.1,.2243)), fromcanonical(d,SVector(-.212423,-.3)))
 
 # function points(d::Disk,n,m,k)
 #     ptsx=0.5*(1-gaussjacobi(n,1.,0.)[1])
 #     ptst=points(PeriodicSegment(),m)
 #
 #     Float64[fromcanonical(d,x,t)[k] for x in ptsx, t in ptst]
 # end
-
-
-boundary(d::Disk) = Circle(d.center,d.radius)

test/runtests.jl

@@ -7,6 +7,7 @@ using ApproxFunBaseTest: testspace, testtransforms, testmultiplication, testragg
 using ApproxFunOrthogonalPolynomials
 using LinearAlgebra
 using SpecialFunctions
+using DomainSets
 _factorial(n) = gamma(n+1)
 
 using StaticArrays: SVector
@@ -294,6 +295,15 @@ end
     @inferred Derivative(Laurent(Circle()))
 end
 
+@testset "Disk" begin
+    d = Disk(ApproxFunBase.AnyDomain())
+    @test ApproxFunBase.isambiguous(d)
+    @test center(𝔻) == [0,0]
+    @test radius(𝔻) == 1
+    d = Disk(2, (2,2))
+    @test ApproxFunBase.fromcanonical(d, [2,2]) == [6,6]
+    @test ApproxFunBase.tocanonical(d, [6,6]) == [2,2]
+end
 
 @testset "Calculus" begin
     for f in (Fun(θ->sin(sin(θ)),SinSpace()),Fun(θ->cos(θ)+cos(3θ),CosSpace()),