move show methods to ApproxFunBase (#784)

Author: jishnub

Project.toml

@@ -20,7 +20,7 @@ SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 
 [compat]
 AbstractFFTs = "1.0"
-ApproxFunBase = "0.5"
+ApproxFunBase = "0.6"
 ApproxFunFourier = "0.2"
 ApproxFunOrthogonalPolynomials = "0.4"
 ApproxFunSingularities = "0.2"

src/Extras/show.jl

@@ -1,6 +1,5 @@
 ## Domains
 
-show(io::IO,d::Segment) = print(io,"the segment [$(leftendpoint(d)),$(rightendpoint(d))]")
 function show(io::IO,d::Line)
     if d.center == angle(d) == 0 && d.α == d.β == -1.
         print(io,"ℝ")
@@ -37,14 +36,6 @@ show(io::IO,d::Point) = print(io,"Point($(d.x))")
 
 ## Spaces
 
-show(io::IO,::ConstantSpace{AnyDomain}) = print(io,"ConstantSpace")
-show(io::IO,S::ConstantSpace) = print(io,"ConstantSpace($(domain(S)))")
-show(io::IO,f::Fun{ConstantSpace{AnyDomain}}) =
-    print(io,"$(convert(Number,f)) anywhere")
-
-show(io::IO,f::Fun{ConstantSpace{DD,RR}}) where {DD,RR} =
-    print(io,"$(convert(Number,f)) on $(domain(f))")
-
 for typ in ("Chebyshev","Fourier","Laurent","Taylor","SinSpace","CosSpace")
     TYP = Meta.parse(typ)
     @eval function show(io::IO,S::$TYP{D,R}) where {D,R}
@@ -105,164 +96,3 @@ function show(io::IO,s::LogWeight)
     show(io,s.space)
     print(io,"]")
 end
-
-function show(io::IO,s::QuotientSpace)
-    show(io,s.space)
-    print(io," /\n")
-    show(io,s.bcs)
-end
-
-function show(io::IO, m::MIME"text/plain", s::QuotientSpace)
-    show(io,s.space)
-    print(io," /\n")
-    show(io, m, s.bcs, header = false)
-end
-
-
-function show(io::IO,ss::SumSpace)
-    s = components(ss)
-    show(io,s[1])
-    for sp in s[2:end]
-        print(io,"⊕")
-        show(io,sp)
-    end
-end
-
-
-function show(io::IO,ss::PiecewiseSpace)
-    s = components(ss)
-    show(io,s[1])
-    for sp in s[2:end]
-        print(io,"⨄")
-        show(io,sp)
-    end
-end
-
-summarystr(ss::ArraySpace) = string(Base.dims2string(length.(axes(ss))), " ArraySpace")
-summary(io::IO, ss::ArraySpace) = print(io, summarystr(ss))
-function show(io::IO,ss::ArraySpace;header::Bool=true)
-    header && print(io,summarystr(ss)*":\n")
-    show(io, ss.spaces)
-end
-
-function show(io::IO,s::TensorSpace)
-    d = length(s.spaces)
-    for i=1:d-1
-        show(io,s.spaces[i])
-        print(io,"⊗")
-    end
-    show(io,s.spaces[d])
-end
-
-function show(io::IO,s::SubSpace)
-    print(io,s.space)
-    print(io,"|")
-    show(io,s.indexes)
-end
-
-
-## Fun
-
-show(io::IO, ::MIME"text/plain", f::Fun) = show(io, f)
-
-function show(io::IO, f::Fun)
-    print(io,"Fun(")
-    show(io,f.space)
-    print(io,",")
-    show(io,f.coefficients)
-    print(io,")")
-end
-
-## MultivariateFun
-
-show(io::IO, ::MIME"text/plain", f::MultivariateFun) = show(io, f)
-
-function show(io::IO,L::LowRankFun)
-    print(io,"LowRankFun on ",space(L)," of rank ",rank(L),".")
-end
-
-function show(io::IO,P::ProductFun)
-    print(io,"ProductFun on ",space(P),".")
-end
-
-
-
-## Operator
-
-summarystr(B::Operator) = string(typeof(B).name.name, " : ", domainspace(B), " → ", rangespace(B))
-summary(io::IO, B::Operator) = print(io, summarystr(B))
-
-struct PrintShow
-    str
-end
-Base.show(io::IO,N::PrintShow) = print(io,N.str)
-
-show(io::IO, B::Operator; kw...) = summary(io, B)
-
-function show(io::IO, ::MIME"text/plain", B::Operator;header::Bool=true)
-    header && println(io, summarystr(B))
-    dsp=domainspace(B)
-
-    if !isambiguous(domainspace(B)) && (eltype(B) <: Number)
-        if isbanded(B) && isinf(size(B,1)) && isinf(size(B,2))
-            BM=B[1:10,1:10]
-
-            M=Matrix{Any}(undef,11,11)
-            fill!(M,PrintShow("⋅"))
-            for j = 1:size(BM,2),k = colrange(BM,j)
-                M[k,j]=BM[k,j]
-            end
-
-            for k=max(1,11-bandwidth(B,2)):11
-                M[k,end]=PrintShow("⋱")
-            end
-            for j=max(1,11-bandwidth(B,1)):10
-                M[end,j]=PrintShow("⋱")
-            end
-
-            print_array(io, M)
-        elseif isinf(size(B,1)) && isinf(size(B,2))
-            BM=B[1:10,1:10]
-
-            M=Matrix{Any}(undef,11,11)
-            for k=1:10,j=1:10
-                M[k,j]=BM[k,j]
-            end
-
-            M[1,end]=PrintShow("⋯")
-            M[end,1]=PrintShow("⋮")
-
-            for k=2:11
-                M[k,end]=M[end,k]=PrintShow("⋱")
-            end
-
-            print_array(io, M)
-        elseif isinf(size(B,1))
-            BM=B[1:10,1:size(B,2)]
-
-            M=Matrix{Any}(undef,11,size(B,2))
-            for k=1:10,j=1:size(B,2)
-                M[k,j]=BM[k,j]
-            end
-            for k=1:size(B,2)
-                M[end,k]=PrintShow("⋮")
-            end
-
-            print_array(io, M)
-        elseif isinf(size(B,2))
-            BM=B[1:size(B,1),1:10]
-
-            M=Matrix{Any}(undef,size(B,1),11)
-            for k=1:size(B,1),j=1:10
-                M[k,j]=BM[k,j]
-            end
-            for k=1:size(B,1)
-                M[k,end]=PrintShow("⋯")
-            end
-
-            print_array(io, M)
-        else
-            print_array(io, AbstractMatrix(B)[1:size(B,1),1:size(B,2)])
-        end
-    end
-end

test/runtests.jl

@@ -240,4 +240,8 @@ end
     show(io, MIME"text/plain"(), Q)
     s = String(take!(io))
     @test startswith(s, "Chebyshev() /")
+
+    f = Fun(Chebyshev()^2, [1,3,4])
+    @test contains(repr(f), repr(space(f)))
+    @test contains(repr(f), repr(coefficients(f)))
 end