Fixes for DomainSets v0.5 (#59)

* Fixes for DomainSets v0.5 * Require DomainSets v0.5
JuliaApproximation · Aug 3, 2021 · 1ed2407 · 1ed2407 · dlfivefifty · Aug 3, 2021
1 parent 2be3bbf
commit 1ed2407
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "ApproxFunOrthogonalPolynomials"
 uuid = "b70543e2-c0d9-56b8-a290-0d4d6d4de211"
-version = "0.4.1"
+version = "0.4.2"
 
 [deps]
 AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
@@ -21,11 +21,11 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
 [compat]
 AbstractFFTs = "0.5, 1"
-ApproxFunBase = "0.4"
+ApproxFunBase = "0.5"
 BandedMatrices = "0.16"
 BlockArrays = "0.14, 0.15"
 BlockBandedMatrices = "0.10"
-DomainSets = "0.4"
+DomainSets = "0.5"
 FFTW = "1.1"
 FastGaussQuadrature = "0.4"
 FastTransforms = "0.12"

diff --git a/src/Domains/Arc.jl b/src/Domains/Arc.jl
@@ -48,6 +48,8 @@ convert(::Type{IT},::AnyDomain) where {IT<:Arc} =
 
 isempty(d::Arc) = false
 
+==(a::Arc, b::Arc) = a.center == b.center && a.radius == b.radius && all(a.angles .== b.angles)
+
 reverseorientation(a::Arc) = Arc(a.center,a.radius,reverse(a.angles))
 
 arclength(d::Arc) = d.radius*(d.angles[2]-d.angles[1])

diff --git a/src/Domains/Domains.jl b/src/Domains/Domains.jl
@@ -10,14 +10,14 @@ isless(d2::Ray{true,T2},d1::IntervalOrSegment{T1}) where {T1<:Real,T2<:Real} = d
 
 
 ## set minus
-Base.setdiff(d::Union{AbstractInterval,Segment,Ray,Line}, ptsin::UnionDomain{AS}) where {AS <: AbstractVector{P}} where {P <: Point} =
+DomainSets.setdiffdomain(d::Union{AbstractInterval,Segment,Ray,Line}, ptsin::UnionDomain{AS}) where {AS <: AbstractVector{P}} where {P <: Point} =
     affine_setdiff(d, ptsin)
 
-Base.setdiff(d::Union{AbstractInterval,Segment,Ray,Line}, ptsin::WrappedDomain{<:AbstractVector}) =
+DomainSets.setdiffdomain(d::Union{AbstractInterval,Segment,Ray,Line}, ptsin::WrappedDomain{<:AbstractVector}) =
     affine_setdiff(d, ptsin)
 
-Base.setdiff(d::Union{AbstractInterval,Segment,Ray,Line}, ptsin::AbstractVector{<:Number}) =
+DomainSets.setdiffdomain(d::Union{AbstractInterval,Segment,Ray,Line}, ptsin::AbstractVector{<:Number}) =
     ApproxFunBase._affine_setdiff(d, ptsin)
 
-Base.setdiff(d::Union{AbstractInterval,Segment,Ray,Line}, ptsin::Number) =
+DomainSets.setdiffdomain(d::Union{AbstractInterval,Segment,Ray,Line}, ptsin::Number) =
     ApproxFunBase._affine_setdiff(d, ptsin)
diff --git a/test/SpacesTest.jl b/test/SpacesTest.jl
@@ -299,7 +299,6 @@ import ApproxFunBase: space, SpaceOperator,
     end
 
     @testset "remove point" begin
-        @test (-1..1) \ 0 == UnionDomain(-1..0, 0..1)
         f = Fun(identity, (-1..1) \ 0)
         @test f(0.1) ≈ 0.1
         @test f(-0.1) ≈ -0.1