Merge pull request #757 from JuliaAI/show-tweaks

Improve short version of `show` for measures

Author: ablaom

src/MLJBase.jl

@@ -110,7 +110,7 @@ const COLUMN_WIDTH = 24
 # how deep to display fields of `MLJType` objects:
 const DEFAULT_SHOW_DEPTH = 0
 const DEFAULT_AS_CONSTRUCTED_SHOW_DEPTH = 2
-const INDENT = 4
+const INDENT = 2
 
 const Arr = AbstractArray
 const Vec = AbstractVector

src/machines.jl

@@ -375,16 +375,18 @@ machines(::Source) = Machine[]
 _cache_status(::Machine{<:Any,true}) = " caches data"
 _cache_status(::Machine{<:Any,false}) = " does not cache data"
 
+Base.show(io::IO, mach::Machine) = print(io, "machine($(mach.model), …)")
 function Base.show(io::IO, ::MIME"text/plain", mach::Machine{M}) where M
-    show(io, mach)
+    #show(io, mach)
+    print(io, "Machine")
     print(io, " trained $(mach.state) time")
     if mach.state == 1
         print(io, ";")
     else
         print(io, "s;")
     end
     println(io, _cache_status(mach))
-    println(io, "  model: $M")
+    println(io, "  model: $(mach.model)")
     println(io, "  args: ")
     for i in eachindex(mach.args)
         arg = mach.args[i]

src/measures/measures.jl

@@ -149,8 +149,6 @@ end
 
 # display:
 show_as_constructed(::Type{<:Measure}) = true
-show_compact(::Type{<:Measure}) = true
-Base.show(io::IO, m::Measure) = show(io, MIME("text/plain"), m)
 
 # info
 function StatisticalTraits.info(M::Type{<:Measure})

src/resampling.jl

@@ -533,8 +533,13 @@ _short(v::Vector) = string("[", join(_short.(v), ", "), "]")
 _short(::Missing) = missing
 
 function Base.show(io::IO, ::MIME"text/plain", e::PerformanceEvaluation)
-    data = hcat(e.measure, round3.(e.measurement), e.operation,
-                [round3.(v) for v in e.per_fold])
+    _measure =  map(e.measure) do m
+        repr(MIME("text/plain"), m)
+    end
+    _measurement = round3.(e.measurement)
+    _per_fold = [round3.(v) for v in e.per_fold]
+
+    data = hcat(_measure, _measurement, e.operation, _per_fold)
     header = ["measure", "measurement", "operation", "per_fold"]
     println(io, "PerformanceEvaluation object "*
             "with these fields:")
@@ -546,7 +551,8 @@ function Base.show(io::IO, ::MIME"text/plain", e::PerformanceEvaluation)
     color_off()
     PrettyTables.pretty_table(io, data, header;
                               header_crayon=PrettyTables.Crayon(bold=false),
-                              alignment=:l)
+                              alignment=:l,
+                              linebreaks=true)
     show_color ? color_on() : color_off()
 end
 

src/show.jl

@@ -120,25 +120,38 @@ show_handle(object) = false
 function simple_repr(T)
     repr = string(T.name.name)
     parameters = T.parameters
-    p_string = ""
-    if length(parameters) > 0
-        p = parameters[1]
-        if p isa DataType
-            p_string = simple_repr(p)
-        elseif p isa Symbol
-            p_string = string(":", p)
-        end
-        if length(parameters) > 1
-            p_string *= ",…"
-        end
-    end
-    isempty(p_string) || (repr *= "{"*p_string*"}")
+
+    # # add abbreviated type parameters:
+    # p_string = ""
+    # if length(parameters) > 0
+    #     p = parameters[1]
+    #     if p isa DataType
+    #         p_string = simple_repr(p)
+    #     elseif p isa Symbol
+    #         p_string = string(":", p)
+    #     end
+    #     if length(parameters) > 1
+    #         p_string *= ",…"
+    #     end
+    # end
+    # isempty(p_string) || (repr *= "{"*p_string*"}")
+
     return repr
 end
 
 # short version of showing a `MLJType` object:
 function Base.show(stream::IO, object::MLJType)
     str = simple_repr(typeof(object))
+    L = length(propertynames(object))
+    if L > 0
+        first_name = propertynames(object) |> first
+        value = getproperty(object, first_name)
+        str *= "($first_name = $value"
+        L > 1 && (str *= ", …")
+        str *= ")"
+    else
+        str *= "()"
+    end
     show_handle(object) && (str *= " $(handle(object))")
     if false # !isempty(propertynames(object))
         printstyled(IOContext(stream, :color=> SHOW_COLOR),
@@ -185,9 +198,13 @@ function fancy(stream, object::MLJType, current_depth, depth, n)
             show_compact(object) ||
                 print(stream, crind(n + length(prefix) - anti))
             print(stream, "$(names[k]) = ")
-            fancy(stream, value, current_depth + 1, depth, n + length(prefix)
-                  - anti + length("$k = "))
-            k == n_names || print(stream, ",")
+            if show_compact(object)
+                show(stream, value)
+            else
+                fancy(stream, value, current_depth + 1, depth, n + length(prefix)
+                      - anti + length("$k = "))
+            end
+            k == n_names || print(stream, ", ")
         end
         print(stream, ")")
         if current_depth == 0 && show_handle(object)