Merge pull request #451 from lucaferranti/lf/displaying

fixed displaying issues

Author: lucaferranti

Project.toml

@@ -1,7 +1,7 @@
 name = "IntervalArithmetic"
 uuid = "d1acc4aa-44c8-5952-acd4-ba5d80a2a253"
 repo = "https://github.com/JuliaIntervals/IntervalArithmetic.jl.git"
-version = "0.17.8"
+version = "0.18.0"
 
 [deps]
 CRlibm = "96374032-68de-5a5b-8d9e-752f78720389"

src/display.jl

@@ -11,8 +11,6 @@ function Base.show(io::IO, params::DisplayParameters)
     print(io, "- significant figures: $(params.sigfigs)")
 end
 
-Base.show(io::IO, x::Complex{<:Interval}) = print(io, x.re, " + ", x.im, "im")
-
 const display_params = DisplayParameters(:standard, false, 6)
 
 const display_options = (:standard, :full, :midpoint)
@@ -274,6 +272,11 @@ function subscriptify(n::Integer)
     join( [Char(subscript_0 + i) for i in dig])
 end
 
+function superscriptify(n::Integer)
+    exps = ['⁰', '¹', '²', '³', '⁴', '⁵', '⁶', '⁷', '⁸', '⁹']
+    dig = reverse(digits(n))
+    return join([exps[d+1] for d in dig])
+end
 
 # fall-back:
 representation(a::Interval{T}, format=nothing) where T =
@@ -319,29 +322,61 @@ function representation(a::DecoratedInterval{T}, format=nothing) where T
 end
 
 
-function representation(X::IntervalBox, format=nothing)
+function representation(X::IntervalBox{N, T}, format=nothing) where {N, T}
 
     if format == nothing
         format = display_params.format  # default
     end
 
-    if display_params.format == :full
-        return string("IntervalBox(", join(X.v, ", "), ")")
+    n = format == :full ? N : superscriptify(N)
+
+    if isempty(X)
+        format == :full && return string("IntervalBox(∅, ", n, ")")
+        return string("∅", n)
+    end
+
+    x = first(X)
+    if all(==(x), X)
+        if format == :full
+            return string("IntervalBox(", representation(x, format), ", ", n, ")")
+        elseif format == :midpoint
+            return string("(", representation(x, format), ")", n)
+        else
+            return string(representation(x, format), n)
+        end
+    end
 
+    if format == :full
+        full_str = representation.(X.v, :full)
+        return string("IntervalBox(", join(full_str, ", "), ")")
+    elseif format == :midpoint
+        return string("(", join(X.v, ") × ("), ")")
     else
         return join(X.v, " × ")
     end
 
 end
 
+function representation(x::Complex{<:Interval}, format=nothing)
+
+    if format == nothing
+        format = display_params.format
+    end
+
+    format == :midpoint && return string('(', x.re, ')', " + ", '(', x.im, ')', "im")
+
+    return string(x.re, " + ", x.im, "im")
+end
 
 for T in (Interval, DecoratedInterval)
     @eval show(io::IO, a::$T{S}) where S = print(io, representation(a))
     @eval showfull(io::IO, a::$T{S}) where S = print(io, representation(a, :full))
     @eval showfull(a::$T{S}) where S = showfull(stdout, a)
 end
 
-T = IntervalBox
-@eval show(io::IO, a::$T) = print(io, representation(a))
-@eval show(io::IO, ::MIME"text/plain", a::$T) = print(io, representation(a))
-@eval showfull(io::IO, a::$T) = print(io, representation(a, :full))
+for T in (IntervalBox, Complex{<:Interval})
+    @eval show(io::IO, a::$T) = print(io, representation(a))
+    @eval show(io::IO, ::MIME"text/plain", a::$T) = print(io, representation(a))
+    @eval showfull(io::IO, a::$T) = print(io, representation(a, :full))
+    @eval showfull(a::$T) = showfull(stdout, a)
+end

test/display_tests/display.jl

@@ -90,6 +90,9 @@ setprecision(Interval, Float64)
         @test typeof(a) == Complex{Interval{Float64}}
         setformat(:standard)
         @test string(a) == "[0, 2] + [1, 1]im"
+
+        setformat(:midpoint)
+        @test string(a) == "(1 ± 1) + (1 ± 0)im"
     end
 
     setprecision(Interval, 256)
@@ -169,11 +172,31 @@ setprecision(Interval, Float64)
         @test string(X) == "[1.09999, 1.20001] × [2.09999, 2.20001]"
 
         X = IntervalBox(-Inf..Inf, -Inf..Inf)
-        @test string(X) == "[-∞, ∞] × [-∞, ∞]"
+        @test string(X) == "[-∞, ∞]²"
+
+        setformat(:full)
+        @test string(X) == "IntervalBox(Interval(-Inf, Inf), 2)"
+
+
+        setformat(:standard)
+        a = IntervalBox(1..2, 2..3)
+        @test string(a) == "[1, 2] × [2, 3]"
+
+        b = IntervalBox(emptyinterval(), 2)
+        @test string(b) == "∅²"
+
+        c = IntervalBox(1..2, 1)
+        @test string(c) == "[1, 2]¹"
 
         setformat(:full)
-        @test string(X) == "IntervalBox(Interval(-Inf, Inf), Interval(-Inf, Inf))"
+        @test string(a) == "IntervalBox(Interval(1.0, 2.0), Interval(2.0, 3.0))"
+        @test string(b) == "IntervalBox(∅, 2)"
+        @test string(c) == "IntervalBox(Interval(1.0, 2.0), 1)"
 
+        setformat(:midpoint)
+        @test string(a) == "(1.5 ± 0.5) × (2.5 ± 0.5)"
+        @test string(b) == "∅²"
+        @test string(c) == "(1.5 ± 0.5)¹"
     end
 end
 
@@ -200,6 +223,14 @@ end
     setformat(decorations=true)
     @test string(x) == "[0, 1]₁₂₈_def"
 
+    a = IntervalBox(1..2, 2..3)
+    b = IntervalBox(emptyinterval(), 2)
+    c = IntervalBox(1..2, 1)
+
+    @test sprint(showfull, a) == "IntervalBox(Interval(1.0, 2.0), Interval(2.0, 3.0))"
+    @test sprint(showfull, b) == "IntervalBox(∅, 2)"
+    @test sprint(showfull, c) == "IntervalBox(Interval(1.0, 2.0), 1)"
+
 end
 
 @testset "@format tests" begin