Fixed some show methods.

Author: jonniedie

docs/make.jl

@@ -3,7 +3,7 @@ using Documenter, ComponentArrays
 makedocs(;
     modules=[ComponentArrays],
     format=Documenter.HTML(
-        canonical = "https://jonniedie.github.io/ComponentArrays.jl/stable",
+        canonical="https://jonniedie.github.io/ComponentArrays.jl/stable",
         ),
     pages=[
         "Home" => "index.md",
@@ -19,6 +19,7 @@ makedocs(;
     sitename="ComponentArrays.jl",
     authors="Jonnie Diegelman",
     assets=String[],
+    doctest=:fix,
 )
 
 deploydocs(;

src/axis.jl

@@ -88,7 +88,7 @@ viewindex(i) = i
 Gives named component access for `ComponentArray`s.
 # Examples
 
-```jldoctest
+```
 julia> using ComponentArrays
 
 julia> ax = Axis((a = 1, b = ViewAxis(2:7, PartitionedAxis(2, (a = 1, b = 2))), c = ViewAxis(8:10, (a = 1, b = 2:3))));
@@ -102,7 +102,7 @@ julia> ca.a
 100.0
 
 julia> ca.b
-3-element LazyArray{ComponentVector{Float64,SubArray...},1}:
+3-element LazyArray{ComponentVector{Float64,SubArray...}}:
  ComponentVector{Float64,SubArray...}(a = 4.0, b = 1.3)
  ComponentVector{Float64,SubArray...}(a = 1.0, b = 1.0)
  ComponentVector{Float64,SubArray...}(a = 4.4, b = 0.4)
@@ -111,7 +111,7 @@ julia> ca.c
 ComponentVector{Float64,SubArray...}(a = 2.0, b = [1.0, 45.0])
 
 julia> ca.c.b
-2-element view(::Array{Float64,1}, 9:10) with eltype Float64:
+2-element view(::Vector{Float64}, 9:10) with eltype Float64:
   1.0
  45.0
 ```

src/componentarray.jl

@@ -21,7 +21,7 @@ julia> x[5]
 400
 
 julia> collect(x)
-7-element Array{Int64,1}:
+7-element Vector{Int64}:
    1
    2
    1
@@ -252,7 +252,7 @@ Access ```.axes``` field of a ```ComponentArray```. This is different than ```ax
 julia> using ComponentArrays
 
 julia> ax = Axis(a=1:3, b=(4:6, (a=1, b=2:3)))
-Axis{(a = 1:3, b = (4:6, (a = 1, b = 2:3)))}()
+Axis(a = 1:3, b = (4:6, (a = 1, b = 2:3)))
 
 julia> A = zeros(6,6);
 

src/lazyarray.jl

@@ -32,6 +32,7 @@ Base.eltype(::LazyArray{T,N,G}) where {T,N,G} = T
 
 Base.show(io::IO, a::LazyArray) = show(io, collect(a))
 function Base.show(io::IO, mime::MIME"text/plain", a::LazyArray)
-    rep = repr(mime, collect(a))
-    return print(replace(rep, "Array" => "LazyArray"; count=1))
+    arr = collect(a)
+    rep = repr(mime, arr)
+    return print(replace(rep, r"(\d+-element )?((Vector|Array){(.+)?})" => s"\1LazyArray{\4}"; count=1))
 end

src/plot_utils.jl

@@ -9,8 +9,8 @@ Get string labels for for each index of a `ComponentVector`. Useful for automati
 julia> x = ComponentArray(a=5, b=[(a=(a=20,b=1), b=0), (a=(a=33,b=1), b=0)], c=(a=(a=2, b=[1,2]), b=[1. 2.; 5 6]))
 ComponentVector{Float64}(a = 5.0, b = [(a = (a = 20.0, b = 1.0), b = 0.0), (a = (a = 33.0, b = 1.0), b = 0.0)], c = (a = (a = 2.0, b = [1.0, 2.0]), b = [1.0 2.0; 5.0 6.0]))
 
-julia> labels(x)
-14-element Array{String,1}:
+julia> ComponentArrays.labels(x)
+14-element Vector{String}:
  "a"
  "b[1].a.a"
  "b[1].a.b"
@@ -51,7 +51,7 @@ julia> x = ComponentArray(a=5, b=[(a=(a=20,b=1), b=0), (a=(a=33,b=1), b=0)], c=(
 ComponentVector{Float64}(a = 5.0, b = [(a = (a = 20.0, b = 1.0), b = 0.0), (a = (a = 33.0, b = 1.0), b = 0.0)], c = (a = (a = 2.0, b = [1.0, 2.0]), b = [1.0 2.0; 5.0 6.0]))
 
 julia> labels(x)
-14-element Array{String,1}:
+14-element Vector{String}:
  "a"
  "b[1].a.a"
  "b[1].a.b"
@@ -68,13 +68,13 @@ julia> labels(x)
  "c.b[2,2]"
 
 julia> label2index(x, "c.a")
-3-element Array{Int64,1}:
+3-element Vector{Int64}:
   8
   9
  10
 
 julia> label2index(x, "b[1]")
-3-element Array{Int64,1}:
+3-element Vector{Int64}:
  2
  3
  4

src/show.jl

@@ -29,9 +29,9 @@ Base.show(io::IO, ::MIME"text/plain", ::Type{ComponentArray{T,N,A,Ax}}) where {T
 Base.show(io::IO, ::Type{<:ComponentArray{T,N,<:Array}}) where {T,N} = print(io, "ComponentArray{$T,$N}") # do not pollute the stacktrace with verbose type printing
 Base.show(io::IO, ::Type{<:ComponentArray{T,1,<:Array}}) where T = print(io, "ComponentVector{$T}")
 Base.show(io::IO, ::Type{<:ComponentArray{T,2,<:Array}}) where T = print(io, "ComponentMatrix{$T}")
-Base.show(io::IO, ::Type{<:ComponentArray{T,N,A}}) where {T,N,A} = print(io, "ComponentArray{$T,$N,$(A.name)...}")
-Base.show(io::IO, ::Type{<:ComponentArray{T,1,A}}) where {T,A} = print(io, "ComponentVector{$T,$(A.name)...}")
-Base.show(io::IO, ::Type{<:ComponentArray{T,2,A}}) where {T,A} = print(io, "ComponentMatrix{$T,$(A.name)...}")
+Base.show(io::IO, ::Type{<:ComponentArray{T,N,A}}) where {T,N,A} = print(io, "ComponentArray{$T,$N,$(nameof(A))...}")
+Base.show(io::IO, ::Type{<:ComponentArray{T,1,A}}) where {T,A} = print(io, "ComponentVector{$T,$(nameof(A))...}")
+Base.show(io::IO, ::Type{<:ComponentArray{T,2,A}}) where {T,A} = print(io, "ComponentMatrix{$T,$(nameof(A))...}")
 
 function Base.show(io::IO, x::ComponentVector)
     print(io, "(")