Merge pull request #263 from JuliaDynamics/hw/show

fix aligned multiline show

Author: hexaeder

src/show.jl

@@ -2,7 +2,7 @@
 
 # overload to reduce excessive printing
 function Base.show(io::IO, @nospecialize(nw::Network))
-    print(io, "Network($(nv(nw.im.g)) vertices, $(ne(nw.im.g)) edges")
+    print(io, "Network($(nv(nw.im.g)) vertices, $(ne(nw.im.g)) edges)")
 end
 
 function Base.show(io::IO, ::MIME"text/plain", @nospecialize(nw::Network))
@@ -304,11 +304,12 @@ function align_strings(_vecofstr::AbstractVector{<:AbstractString}; padding=:alt
         end
     end
     alig = align_strings(splitted; padding)
-    if !isempty(newlines)
-        for i in newlines
-            alig[i] = alig[i] * "\n" * alig[i+1]
-        end
-        deleteat!(alig, newlines .+1 )
+
+    @assert issorted(newlines)
+    while !isempty(newlines)
+        i = pop!(newlines)
+        alig[i] = alig[i] * "\n" * alig[i+1]
+        deleteat!(alig, i+1)
     end
     alig
 end

test/runtests.jl

@@ -45,6 +45,7 @@ haskey(ENV, "BUILDKITE") && @test CUDA.functional() # fail early in buildkite if
     @safetestset "initialization test" begin include("initialization_test.jl") end
     @safetestset "Callbacks test" begin include("callbacks_test.jl") end
     @safetestset "Metadata test" begin include("metadata_test.jl") end
+    @safetestset "Show-methods test" begin include("show_test.jl") end
 
     @safetestset "AD test" begin include("AD_test.jl") end
 

test/show_test.jl

@@ -0,0 +1,53 @@
+using NetworkDynamics
+using Graphs
+using Test
+
+(isinteractive() && @__MODULE__()==Main ? includet : include)("ComponentLibrary.jl")
+
+g = SimpleGraph([0 1 1 0 1;
+                 1 0 1 1 0;
+                 1 1 0 1 0;
+                 0 1 1 0 1;
+                 1 0 0 1 0])
+
+vs = [Lib.swing_mtk() for _ in 1:5];
+set_default!(vs[1], :Pmech, -1)
+set_default!(vs[2], :Pmech, 1.5)
+set_default!(vs[3], :Pmech, -1)
+set_default!(vs[4], :Pmech, -1)
+set_default!(vs[5], :Pmech, 1.5)
+
+ls = [Lib.line_mtk() for _ in 1:7];
+nw = Network(g, vs, ls)
+s = NWState(nw)
+p = NWParameter(nw)
+
+repr(nw)
+repr("text/plain", nw)
+
+repr("text/plain", vs[1])
+repr("text/plain", ls[1])
+
+
+repr("text/plain", s)
+repr("text/plain", p)
+repr("text/plain", s.v)
+repr("text/plain", s.e)
+repr("text/plain", p.v)
+repr("text/plain", p.e)
+
+affect = ComponentAffect([], [:limit, :K]) do u, p, ctx
+    nothing
+end
+condition = ComponentCondition([:P, :₋P, :srcθ], [:limit, :K]) do u, p, t
+    nothing
+end
+cb1 = PresetTimeComponentCallback(1.0, affect)
+repr("text/plain", cb1)
+cb2 = ContinousComponentCallback(condition, affect)
+repr("text/plain", cb2)
+cb3 = DiscreteComponentCallback(condition, affect)
+repr("text/plain", cb3)
+set_callback!(ls[1], (cb1, cb2, cb3))
+repr("text/plain", ls[1])
+repr("text/plain", nw)