Merge pull request #1 from JuliaApproximation/dl/domainsets002

Dl/domainsets002

Project.toml

@@ -1,6 +1,6 @@
 name = "ApproxFunOrthogonalPolynomials"
 uuid = "b70543e2-c0d9-56b8-a290-0d4d6d4de211"
-version = "0.0.3"
+version = "0.1"
 
 [deps]
 AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
@@ -30,22 +30,22 @@ ToeplitzMatrices = "c751599d-da0a-543b-9d20-d0a503d91d24"
 
 [compat]
 AbstractFFTs = "≥ 0.3.1"
-ApproxFunBase = "0.0.4"
+ApproxFunBase = "0.1"
 BandedMatrices = "0.9.0"
 BlockArrays = "0.8.0"
 BlockBandedMatrices = "0.4.0"
 Calculus = "≥ 0.1.15"
 DSP = "≥ 0.5.1"
-DomainSets = "0.0.1"
+DomainSets = "0.0.2"
 DualNumbers = "≥ 0.4.0"
 FFTW = "≥ 0.2.4"
 FastGaussQuadrature = "≥ 0.3.2"
 FastTransforms = "≥ 0.4.2"
 FillArrays = "≥ 0.5.0"
-InfiniteArrays = "0.0.3"
+InfiniteArrays = "0.1"
 IntervalSets = "≥ 0.3.1"
 LazyArrays = "0.8"
-LowRankApprox = "≥ 0.1.4"
+LowRankApprox = "≥ 0.2"
 Reexport = "≥ 0.2.0"
 SpecialFunctions = "≥ 0.7.0"
 StaticArrays = "≥ 0.8.3"

src/ApproxFunOrthogonalPolynomials.jl

@@ -47,7 +47,7 @@ import ApproxFunBase: normalize!, flipsign, FiniteRange, Fun, MatrixFun, UnsetSp
 
 import DomainSets: Domain, indomain, UnionDomain, ProductDomain, FullSpace, Point, elements, DifferenceDomain,
             Interval, ChebyshevInterval, boundary, ∂, rightendpoint, leftendpoint,
-            dimension
+            dimension, WrappedDomain
 
 import BandedMatrices: bandrange, bandshift,
                 inbands_getindex, inbands_setindex!, bandwidth, AbstractBandedMatrix,

src/Domains/Domains.jl

@@ -13,3 +13,8 @@ isless(d2::Ray{true,T2},d1::IntervalOrSegment{T1}) where {T1<:Real,T2<:Real} = d
 Base.setdiff(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}) = 
+    affine_setdiff(d, ptsin)
+
+Base.setdiff(d::Union{AbstractInterval,Segment,Ray,Line}, ptsin::AbstractVector{<:Number}) = 
+    ApproxFunBase._affine_setdiff(d, ptsin)

test/ODETest.jl

@@ -1,5 +1,5 @@
 using ApproxFunOrthogonalPolynomials, ApproxFunBase, SpecialFunctions, LazyArrays, Test
-    import ApproxFunBase: Multiplication, testraggedbelowoperator, testbandedoperator, interlace, ∞
+import ApproxFunBase: Multiplication, testraggedbelowoperator, testbandedoperator, interlace, ∞
 
 @testset "ODE" begin
     @testset "Airy" begin
@@ -120,7 +120,7 @@ using ApproxFunOrthogonalPolynomials, ApproxFunBase, SpecialFunctions, LazyArray
     end
 
     @testset "Union of intervals" begin
-        x=Fun(identity,Domain(-2..15) \ [-1,0])
+        x=Fun(identity,(-2..15) \ [-1,0])
         sp=space(x)
 
         B = [Dirichlet(sp);continuity(sp,0:1)]

test/SpeedODETest.jl

@@ -78,7 +78,7 @@ println("Complex exp: Time should be 0.03")
 
 
 ## Piecewise
-x=Fun(identity,Domain(-20..15) \ Set([-10.,-5.,0.,1.]))
+x=Fun(identity,Domain(-20..15) \ [-10.,-5.,0.,1.])
 sp=space(x)
 D=Derivative(sp)
 B=[Dirichlet(sp);continuity(sp,0:1)]