Map to canonical in weighted space display (#83)

* Map to canonical in weighted space display

* Bump version to v0.3.15

Author: jishnub

Project.toml

@@ -1,6 +1,6 @@
 name = "ApproxFunSingularities"
 uuid = "f8fcb915-6b99-5be2-b79a-d6dbef8e6e7e"
-version = "0.3.14"
+version = "0.3.15"
 
 [deps]
 ApproxFunBase = "fbd15aa5-315a-5a7d-a8a4-24992e37be05"
@@ -21,7 +21,7 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 ApproxFunSingularitiesStaticArraysExt = "StaticArrays"
 
 [compat]
-ApproxFunBase = "0.8.36, 0.9"
+ApproxFunBase = "0.8.56, 0.9.12"
 ApproxFunBaseTest = "0.1"
 ApproxFunOrthogonalPolynomials = "0.2.3, 0.3, 0.4, 0.5, 0.6"
 Aqua = "0.6"

src/JacobiWeight.jl

@@ -509,16 +509,16 @@ end
 function show(io::IO,s::JacobiWeight)
     d=domain(s)
     #TODO: Get shift and weights right
+    sym = domain(s) == canonicaldomain(s) ? "x" : "𝑪($(domain(s)), x)"
     if s.α==s.β
-        print(io,"(1-x^2)^", s.α, "[")
+        print(io,"(1-$sym^2)^", s.α)
     elseif s.β==0
-        print(io,"(1-x)^", s.α, "[")
+        print(io,"(1-$sym)^", s.α)
     elseif s.α==0
-        print(io,"(1+x)^", s.β, "[")
+        print(io,"(1+$sym)^", s.β)
     else
-        print(io,"(1+x)^", s.β, "(1-x)^", s.α, "[")
+        print(io,"(1+$sym)^", s.β, " * (1-$sym)^", s.α)
     end
-
-    show(io,s.space)
-    print(io,"]")
+    print(io, " * ")
+    show(io, s.space)
 end

src/LogWeight.jl

@@ -99,12 +99,11 @@ end
 function show(io::IO,s::LogWeight)
     d=domain(s)
     #TODO: Get shift and weights right
+    sym = domain(s) == canonicaldomain(s) ? "x" : "𝑪($(domain(s)), x)"
     if s.α==s.β
-        print(io,"log((1-x^2)^", s.α, ")[")
+        print(io,"log((1-$sym^2)^", s.α, ")")
     else
-        print(io,"log((1+x)^", s.β, "(1-x)^", s.α, ")[")
+        print(io,"log((1+$sym)^", s.β, " * (1-$sym)^", s.α, ")")
     end
-
-    show(io,s.space)
-    print(io,"]")
+    print(io, " * ", s.space)
 end

test/runtests.jl

@@ -853,37 +853,50 @@ end
         w = LogWeight(1.0, 0.0, Chebyshev())
         s = repr(w)
         @test startswith(s, "log")
-        @test contains(s, "Chebyshev")
+        @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, "Chebyshev()")
         @test contains(s, "(1-x^2)^1")
+
+        w = LogWeight(1, 2, Chebyshev(0..1))
+        s = repr(w)
+        @test startswith(s, "log")
+        @test contains(s, "Chebyshev($(0..1))")
+        @test contains(s, "(1+𝑪($(0..1), x))^1")
+        @test contains(s, "(1-𝑪($(0..1), x))^2")
     end
     @testset "JacobiWeight" begin
         w = JacobiWeight(1.0, 0.0, Chebyshev())
         s = repr(w)
-        @test contains(s, "Chebyshev")
+        @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, "Chebyshev()")
         @test contains(s, "(1-x)^1")
 
         w = JacobiWeight(1.0, 1.0, Chebyshev())
         s = repr(w)
-        @test contains(s, "Chebyshev")
+        @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, "Chebyshev()")
         @test contains(s, "(1+x)^1")
         @test contains(s, "(1-x)^2")
+
+        w = JacobiWeight(1,2,Chebyshev(0..1))
+        s = repr(w)
+        @test contains(s, "Chebyshev($(0..1))")
+        @test contains(s, "(1+𝑪($(0..1), x))^1")
+        @test contains(s, "(1-𝑪($(0..1), x))^2")
     end
 end