Move ContinuousSpace to ApproxFunBase

Project.toml

@@ -1,6 +1,6 @@
 name = "ApproxFunOrthogonalPolynomials"
 uuid = "b70543e2-c0d9-56b8-a290-0d4d6d4de211"
-version = "0.6.15"
+version = "0.6.16"
 
 [deps]
 ApproxFunBase = "fbd15aa5-315a-5a7d-a8a4-24992e37be05"
@@ -20,7 +20,7 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
 [compat]
-ApproxFunBase = "0.8"
+ApproxFunBase = "0.8.1"
 ApproxFunBaseTest = "0.1"
 Aqua = "0.5"
 BandedMatrices = "0.16, 0.17"

src/ApproxFunOrthogonalPolynomials.jl

@@ -42,7 +42,7 @@ import ApproxFunBase: Fun, SubSpace, WeightSpace, NoSpace, HeavisideSpace,
                     block, blockstart, blockstop, blocklengths, isblockbanded,
                     pointscompatible, affine_setdiff, complexroots,
                     ℓ⁰, recα, recβ, recγ, ℵ₀, ∞, RectDomain,
-                    assert_integer, supportsinplacetransform
+                    assert_integer, supportsinplacetransform, ContinuousSpace
 
 import DomainSets: Domain, indomain, UnionDomain, FullSpace, Point,
             Interval, ChebyshevInterval, boundary, rightendpoint, leftendpoint,

src/Spaces/Ultraspherical/ContinuousSpace.jl

@@ -1,137 +1,14 @@
 export ContinuousSpace
 
-struct ContinuousSpace{T,R,P<:PiecewiseSegment{T}} <: Space{P,R}
-    domain::P
-end
-
-ContinuousSpace(d::PiecewiseSegment{T}) where {T} =
-    ContinuousSpace{T,real(eltype(T)),typeof(d)}(d)
-
-
 Space(d::PiecewiseSegment) = ContinuousSpace(d)
 
-isperiodic(C::ContinuousSpace) = isperiodic(domain(C))
-
 const PiecewiseSpaceReal{CD} = PiecewiseSpace{CD,<:Any,<:Real}
 const PiecewiseSpaceRealChebyDirichlet11 =
         PiecewiseSpaceReal{<:TupleOrVector{ChebyshevDirichlet{1,1}}}
 
-spacescompatible(a::ContinuousSpace,b::ContinuousSpace) = domainscompatible(a,b)
 conversion_rule(a::ContinuousSpace, b::PiecewiseSpaceRealChebyDirichlet11) = a
 
-plan_transform(sp::ContinuousSpace,vals::AbstractVector) =
-    TransformPlan{eltype(vals),typeof(sp),false,Nothing}(sp,nothing)
-
-function *(P::TransformPlan{T,<:ContinuousSpace,false},vals::AbstractVector{T}) where {T}
-    S = P.space
-    n=length(vals)
-    d=domain(S)
-    K=ncomponents(d)
-    k=div(n,K)
-
-    PT=promote_type(prectype(d),eltype(vals))
-    if k==0
-        vals
-    elseif isperiodic(d)
-        ret=Array{PT}(undef, max(K,n-K))
-        r=n-K*k
-
-        for j=1:r
-            cfs=transform(ChebyshevDirichlet{1,1}(component(d,j)),
-                          vals[(j-1)*(k+1)+1:j*(k+1)])
-            if j==1
-                ret[1]=cfs[1]-cfs[2]
-                ret[2]=cfs[1]+cfs[2]
-            elseif j < K
-                ret[j+1]=cfs[1]+cfs[2]
-            end
-            ret[K+j:K:end]=cfs[3:end]
-        end
-
-        for j=r+1:K
-            cfs=transform(ChebyshevDirichlet{1,1}(component(d,j)),
-                          vals[r*(k+1)+(j-r-1)*k+1:r*(k+1)+(j-r)*k])
-            if length(cfs)==1 && j <K
-                ret[j+1]=cfs[1]
-            elseif j==1
-                ret[1]=cfs[1]-cfs[2]
-                ret[2]=cfs[1]+cfs[2]
-            elseif j < K
-                ret[j+1]=cfs[1]+cfs[2]
-            end
-            ret[K+j:K:end]=cfs[3:end]
-        end
-
-        ret
-    else
-        ret=Array{PT}(undef, n-K+1)
-        r=n-K*k
-
-        for j=1:r
-            cfs=transform(ChebyshevDirichlet{1,1}(component(d,j)),
-                          vals[(j-1)*(k+1)+1:j*(k+1)])
-            if j==1
-                ret[1]=cfs[1]-cfs[2]
-            end
-
-            ret[j+1]=cfs[1]+cfs[2]
-            ret[K+j+1:K:end]=cfs[3:end]
-        end
-
-        for j=r+1:K
-            cfs=transform(ChebyshevDirichlet{1,1}(component(d,j)),
-                          vals[r*(k+1)+(j-r-1)*k+1:r*(k+1)+(j-r)*k])
-
-            if length(cfs) ≤ 1
-                ret .= cfs
-            else
-                if j==1
-                    ret[1]=cfs[1]-cfs[2]
-                end
-                ret[j+1]=cfs[1]+cfs[2]
-                ret[K+j+1:K:end]=cfs[3:end]
-            end
-        end
-
-        ret
-    end
-end
-
 components(S::ContinuousSpace) = [ChebyshevDirichlet{1,1}(s) for s in components(domain(S))]
-canonicalspace(S::ContinuousSpace) = PiecewiseSpace(components(S))
-convert(::Type{PiecewiseSpace}, S::ContinuousSpace) = canonicalspace(S)
-
-blocklengths(C::ContinuousSpace) = Fill(ncomponents(C.domain),∞)
-
-block(C::ContinuousSpace,k) = Block((k-1)÷ncomponents(C.domain)+1)
-
-
-## components
-
-components(f::Fun{<:ContinuousSpace},j::Integer) = components(Fun(f,canonicalspace(f)),j)
-components(f::Fun{<:ContinuousSpace}) = components(Fun(f,canonicalspace(space(f))))
-
-
-function points(f::Fun{<:ContinuousSpace})
-    n=ncoefficients(f)
-    d=domain(f)
-    K=ncomponents(d)
-
-    m=isperiodic(d) ? max(K,n+2K-1) : n+K
-    points(f.space,m)
-end
-
-## Conversion
-
-coefficients(cfsin::AbstractVector,A::ContinuousSpace,B::PiecewiseSpace) =
-    defaultcoefficients(cfsin,A,B)
-
-coefficients(cfsin::AbstractVector,A::PiecewiseSpace,B::ContinuousSpace) =
-    default_Fun(Fun(A,cfsin),B).coefficients
-
-coefficients(cfsin::AbstractVector,A::ContinuousSpace,B::ContinuousSpace) =
-    default_Fun(Fun(A,cfsin),B).coefficients
-
 
 # We implemnt conversion between continuous space and PiecewiseSpace with Chebyshev dirichlet
 
@@ -407,34 +284,5 @@ function BlockBandedMatrix(S::SubOperator{T,<:ConcreteDirichlet{<:TensorChebyshe
 end
 
 
-union_rule(A::PiecewiseSpace, B::ContinuousSpace) = union(A, strictconvert(PiecewiseSpace, B))
-union_rule(A::ConstantSpace, B::ContinuousSpace) = B
 union_rule(A::ContinuousSpace, B::PolynomialSpace{<:IntervalOrSegment}) =
     Space(domain(A) ∪ domain(B))
-
-function approx_union(a::AbstractVector{T}, b::AbstractVector{V}) where {T,V}
-    ret = sort!(union(a,b))
-    for k in length(ret)-1:-1:1
-        isapprox(ret[k] , ret[k+1]; atol=10eps()) && deleteat!(ret, k+1)
-    end
-    ret
-end
-
-
-function union_rule(A::ContinuousSpace{<:Real}, B::ContinuousSpace{<:Real})
-    p_A,p_B = domain(A).points, domain(B).points
-    a,b = minimum(p_A),  maximum(p_A)
-    c,d = minimum(p_B),  maximum(p_B)
-    @assert !isempty((a..b) ∩ (c..d))
-    ContinuousSpace(PiecewiseSegment(approx_union(p_A, p_B)))
-end
-
-function integrate(f::Fun{<:ContinuousSpace})
-    cs = [cumsum(x) for x in components(f)]
-    for k=1:length(cs)-1
-        cs[k+1] += last(cs[k])
-    end
-    Fun(Fun(cs, PiecewiseSpace), space(f))
-end
-
-cumsum(f::Fun{<:ContinuousSpace}) = integrate(f)

test/ODETest.jl

@@ -137,7 +137,7 @@ using ApproxFunBaseTest: testraggedbelowoperator, testbandedoperator
         D=Derivative(sp)
         A=[B;D^2-x]
 
-        ApproxFunBase.testraggedbelowoperator(A)
+        testraggedbelowoperator(A)
         QR=qr(A)
 
         @time u=QR\[[airyai(-2.),0.0],zeros(4),0.0]