good show of VectorOfArray

Author: ChrisRackauckas

src/RecursiveArrayTools.jl

@@ -5,13 +5,14 @@ module RecursiveArrayTools
   using Compat, Juno, RecipesBase, StaticArrays
 
   @compat abstract type AbstractVectorOfArray{T, N} <: AbstractArray{T, N} end
+  @compat abstract type AbstractDiffEqArray{T, N} <: AbstractVectorOfArray{T, N} end
 
   include("utils.jl")
   include("vector_of_array.jl")
   include("array_partition.jl")
 
-  export VectorOfArray, DiffEqArray, AbstractVectorOfArray, vecarr_to_arr,
-         vecarr_to_vectors, tuples
+  export VectorOfArray, DiffEqArray, AbstractVectorOfArray, AbstractDiffEqArray,
+         vecarr_to_arr, vecarr_to_vectors, tuples
 
   export recursivecopy, recursivecopy!, vecvecapply, copyat_or_push!,
          vecvec_to_mat, recursive_one, recursive_mean, recursive_eltype

src/array_partition.jl

@@ -96,7 +96,6 @@ Juno.@render Juno.Inline x::ArrayPartition begin
   Juno.LazyTree(typeof(x), () -> [Juno.SubTree(Juno.Text("$f → "), Juno.getfield′(x, f)) for f in fields])
 end
 Base.summary(A::ArrayPartition) = string(typeof(A), " with arrays:")
-Base.show(M::MIME"text/plain",A::ArrayPartition) = (Base.showarray.(A.x); nothing)
 Base.show(A::ArrayPartition) = (Base.show.(A.x); nothing)
 Base.display(A::ArrayPartition) = (println(summary(A));display.(A.x);nothing)
 Base.print(A::ArrayPartition) = show(A)

src/vector_of_array.jl

@@ -3,7 +3,7 @@ type VectorOfArray{T, N, A} <: AbstractVectorOfArray{T, N}
   u::A # A <: AbstractVector{<: AbstractArray{T, N - 1}}
 end
 # VectorOfArray with an added series for time
-type DiffEqArray{T, N, A, B} <: AbstractVectorOfArray{T, N}
+type DiffEqArray{T, N, A, B} <: AbstractDiffEqArray{T, N}
   u::A # A <: AbstractVector{<: AbstractArray{T, N - 1}}
   t::B
 end
@@ -58,6 +58,14 @@ vecarr_to_vectors(VA::AbstractVectorOfArray) = [VA[i,:] for i in eachindex(VA[1]
 # make it show just like its data
 Base.show(io::IO, x::AbstractVectorOfArray) = show(io, x.u)
 Base.show(io::IO, m::MIME"text/plain", x::AbstractVectorOfArray) = show(io, m, x.u)
+Base.summary(A::AbstractVectorOfArray) = string("VectorOfArray{",eltype(A),",",ndims(A),"}")
+Base.display(A::AbstractVectorOfArray) = (println(summary(A));println("u:");display(A.u);nothing)
+Base.print(A::AbstractVectorOfArray) = show(A)
+Base.println(A::AbstractVectorOfArray) = show(A)
+
+Base.show(io::IO, x::AbstractDiffEqArray) = (print(io,"t: ");show(io, x.t);println(io);print(io,"u: ");show(io, x.u))
+Base.show(io::IO, m::MIME"text/plain", x::AbstractDiffEqArray) = (print(io,"t: ");show(io,m,x.t);println(io);print(io,"u: ");show(io,m,x.u))
+Base.display(A::AbstractDiffEqArray) = (println(summary(A));println("t:");display(A.t);println("u:");display(A.u);nothing)
 
 # restore the type rendering in Juno
 Juno.@render Juno.Inline x::AbstractVectorOfArray begin
@@ -69,7 +77,7 @@ end
 @recipe function f(VA::AbstractVectorOfArray)
   vecarr_to_vectors(VA)
 end
-@recipe function f(VA::DiffEqArray)
+@recipe function f(VA::AbstractDiffEqArray)
   A = vecarr_to_vectors(VA)
   VA.t,A
 end

test/basic_indexing.jl

@@ -1,8 +1,12 @@
+using RecursiveArrayTools
 
 # Example Problem
 recs = [[1, 2, 3], [4, 5, 6], [7, 8, 9]]
 testa = cat(2, recs...)
 testva = VectorOfArray(recs)
+t = [1,2,3]
+diffeq = DiffEqArray(recs,t)
+
 testa[1:2, 1:2] == [1 4; 2 5]
 testva[1:2, 1:2] == [1 4; 2 5]
 testa[1:2, 1:2] == [1 4; 2 5]