Skip to content

Commit f48d434

Browse files
Merge pull request #159 from SciML/myb/fix
Round-trip printing
2 parents 46288a5 + d2f24db commit f48d434

File tree

3 files changed

+22
-23
lines changed

3 files changed

+22
-23
lines changed

src/RecursiveArrayTools.jl

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,32 @@ $(DocStringExtensions.README)
55
module RecursiveArrayTools
66

77
using DocStringExtensions
8-
using Requires, RecipesBase, StaticArrays, Statistics,
9-
ArrayInterface, LinearAlgebra
10-
11-
import ChainRulesCore
12-
import ChainRulesCore: NoTangent
13-
import ZygoteRules
14-
abstract type AbstractVectorOfArray{T, N, A} <: AbstractArray{T, N} end
15-
abstract type AbstractDiffEqArray{T, N, A} <: AbstractVectorOfArray{T, N, A} end
16-
17-
include("utils.jl")
18-
include("vector_of_array.jl")
19-
include("array_partition.jl")
20-
include("init.jl")
21-
include("zygote.jl")
22-
23-
export VectorOfArray, DiffEqArray, AbstractVectorOfArray, AbstractDiffEqArray,
8+
using Requires, RecipesBase, StaticArrays, Statistics,
9+
ArrayInterface, LinearAlgebra
10+
11+
import ChainRulesCore
12+
import ChainRulesCore: NoTangent
13+
import ZygoteRules
14+
abstract type AbstractVectorOfArray{T, N, A} <: AbstractArray{T, N} end
15+
abstract type AbstractDiffEqArray{T, N, A} <: AbstractVectorOfArray{T, N, A} end
16+
17+
include("utils.jl")
18+
include("vector_of_array.jl")
19+
include("array_partition.jl")
20+
include("init.jl")
21+
include("zygote.jl")
22+
23+
Base.show(io::IO, x::Union{ArrayPartition,AbstractVectorOfArray}) = invoke(show, Tuple{typeof(io), Any}, io, x)
24+
25+
export VectorOfArray, DiffEqArray, AbstractVectorOfArray, AbstractDiffEqArray,
2426
AllObserved, vecarr_to_arr, vecarr_to_vectors, tuples
2527

26-
export recursivecopy, recursivecopy!, vecvecapply, copyat_or_push!,
27-
vecvec_to_mat, recursive_one, recursive_mean, recursive_bottom_eltype,
28-
recursive_unitless_bottom_eltype, recursive_unitless_eltype
28+
export recursivecopy, recursivecopy!, vecvecapply, copyat_or_push!,
29+
vecvec_to_mat, recursive_one, recursive_mean, recursive_bottom_eltype,
30+
recursive_unitless_bottom_eltype, recursive_unitless_eltype
2931

3032

31-
export ArrayPartition
33+
export ArrayPartition
3234

3335

3436
end # module

src/array_partition.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ Base.last(A::ArrayPartition) = last(last(A.x))
244244

245245
## display
246246
Base.summary(A::ArrayPartition) = string(typeof(A), " with arrays:")
247-
Base.show(io::IO,A::ArrayPartition) = map(x->Base.show(io,x),A.x)
248247
Base.show(io::IO, m::MIME"text/plain", A::ArrayPartition) = show(io, m, A.x)
249248

250249
## broadcasting

src/vector_of_array.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,9 @@ Base.vec(VA::AbstractVectorOfArray) = vec(convert(Array,VA)) # Allocates
220220
@inline Statistics.cor(VA::AbstractVectorOfArray;kwargs...) = cor(Array(VA);kwargs...)
221221

222222
# make it show just like its data
223-
Base.show(io::IO, x::AbstractVectorOfArray) = Base.print_array(io, x.u)
224223
Base.show(io::IO, m::MIME"text/plain", x::AbstractVectorOfArray) = (println(io, summary(x), ':'); show(io, m, x.u))
225224
Base.summary(A::AbstractVectorOfArray) = string("VectorOfArray{",eltype(A),",",ndims(A),"}")
226225

227-
Base.show(io::IO, x::AbstractDiffEqArray) = (print(io,"t: ");show(io, x.t);println(io);print(io,"u: ");show(io, x.u))
228226
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))
229227

230228
# plot recipes

0 commit comments

Comments
 (0)