move show methods from ApproxFun (#23)

Author: jishnub

Project.toml

@@ -1,6 +1,6 @@
 name = "ApproxFunSingularities"
 uuid = "f8fcb915-6b99-5be2-b79a-d6dbef8e6e7e"
-version = "0.2.5"
+version = "0.3.0"
 
 [deps]
 ApproxFunBase = "fbd15aa5-315a-5a7d-a8a4-24992e37be05"
@@ -13,7 +13,7 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
 [compat]
 ApproxFunBase = "0.3.8, 0.4, 0.5, 0.6"
-ApproxFunOrthogonalPolynomials = "0.2.3, 0.3, 0.4"
+ApproxFunOrthogonalPolynomials = "0.2.3, 0.3, 0.4, 0.5"
 DomainSets = "0.4, 0.5"
 IntervalSets = "0.5, 0.6, 0.7"
 Reexport = "0.2, 1"

src/JacobiWeight.jl

@@ -474,3 +474,20 @@ for FUNC in (:maxspace_rule,:union_rule,:hasconversion)
         end
     end
 end
+
+function show(io::IO,s::JacobiWeight)
+    d=domain(s)
+    #TODO: Get shift and weights right
+    if s.α==s.β
+        print(io,"(1-x^2)^", s.α, "[")
+    elseif s.β==0
+        print(io,"(1-x)^", s.α, "[")
+    elseif s.α==0
+        print(io,"(1+x)^", s.β, "[")
+    else
+        print(io,"(1+x)^", s.β, "(1-x)^", s.α, "[")
+    end
+
+    show(io,s.space)
+    print(io,"]")
+end

src/LogWeight.jl

@@ -95,3 +95,16 @@ function Multiplication(f::Fun{<:LogWeight},S::Space)
     rsp=LogWeight(space(f).β,space(f).α,rangespace(M))
     MultiplicationWrapper(f,SpaceOperator(M,S,rsp))
 end
+
+function show(io::IO,s::LogWeight)
+    d=domain(s)
+    #TODO: Get shift and weights right
+    if s.α==s.β
+        print(io,"log((1-x^2)^", s.α, ")[")
+    else
+        print(io,"log((1+x)^", s.β, "(1-x)^", s.α, ")[")
+    end
+
+    show(io,s.space)
+    print(io,"]")
+end

test/runtests.jl

@@ -777,3 +777,42 @@ end
         @time \(QR1,f; tolerance=1E-10)
     println("Laplace Dirichlet: should be ~0.015, 0.015, 0.001")
 end
+
+@testset "show" begin
+    @testset "logweight" begin
+        w = LogWeight(1.0, 0.0, Chebyshev())
+        s = repr(w)
+        @test startswith(s, "log")
+        @test contains(s, "Chebyshev")
+        @test contains(s, "(1+x)^1")
+        @test contains(s, "(1-x)^0")
+
+        w = LogWeight(1.0, 1.0, Chebyshev())
+        s = repr(w)
+        @test startswith(s, "log")
+        @test contains(s, "Chebyshev")
+        @test contains(s, "(1-x^2)^1")
+    end
+    @testset "JacobiWeight" begin
+        w = JacobiWeight(1.0, 0.0, Chebyshev())
+        s = repr(w)
+        @test contains(s, "Chebyshev")
+        @test contains(s, "(1+x)^1")
+
+        w = JacobiWeight(0.0, 1.0, Chebyshev())
+        s = repr(w)
+        @test contains(s, "Chebyshev")
+        @test contains(s, "(1-x)^1")
+
+        w = JacobiWeight(1.0, 1.0, Chebyshev())
+        s = repr(w)
+        @test contains(s, "Chebyshev")
+        @test contains(s, "(1-x^2)^1")
+
+        w = JacobiWeight(1.0, 2.0, Chebyshev())
+        s = repr(w)
+        @test contains(s, "Chebyshev")
+        @test contains(s, "(1+x)^1")
+        @test contains(s, "(1-x)^2")
+    end
+end