From b20ef64770ed0d076e8e101bc445bdf9b501a079 Mon Sep 17 00:00:00 2001 From: Simone Carlo Surace Date: Mon, 27 Oct 2025 12:40:47 +0100 Subject: [PATCH 1/5] Fix pretty tables integration --- Project.toml | 2 +- src/abstractmultilayergraph.jl | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Project.toml b/Project.toml index ffe8273..76d1c7b 100644 --- a/Project.toml +++ b/Project.toml @@ -30,7 +30,7 @@ Graphs = "1" IterTools = "1.4" MetaGraphs = "0.7, 0.8" OMEinsum = "0.8, 0.9" -PrettyTables = "2.2, 3" +PrettyTables = "3" SimpleTraits = "0.9" SimpleValueGraphs = "0.4" SimpleWeightedGraphs = "1.2" diff --git a/src/abstractmultilayergraph.jl b/src/abstractmultilayergraph.jl index be9b9d7..a42cf88 100644 --- a/src/abstractmultilayergraph.jl +++ b/src/abstractmultilayergraph.jl @@ -1230,16 +1230,14 @@ function to_string(x::AbstractMultilayerGraph) layers_names = name.(x.layers) layers_underlying_graphs = typeof.(graph.(x.layers)) - layers_table = pretty_table( - String, hcat(layers_names, layers_underlying_graphs); title="### LAYERS", - header=(["NAME", "UNDERLYING GRAPH"]), + column_labels=(["NAME", "UNDERLYING GRAPH"]), alignment=:c, - header_alignment=:c, - header_crayon=crayon"yellow bold", - hlines=:all, + column_label_alignment=:c, + style=TextTableStyle(; first_line_column_label=crayon"yellow bold"), + table_format=TextTableFormat(; @text__all_horizontal_lines()), ) interlayers_names = name.(values(x.interlayers)) @@ -1250,7 +1248,6 @@ function to_string(x::AbstractMultilayerGraph) getproperty.(values(x.interlayers), Ref(:transfer_vertex_metadata)) interlayers_table = pretty_table( - String, hcat( interlayers_names, interlayer_layer_1s, @@ -1259,13 +1256,13 @@ function to_string(x::AbstractMultilayerGraph) interlayer_tranfers, ); title="### INTERLAYERS", - header=([ + column_labels=([ "NAME", "LAYER 1", "LAYER 2", "UNDERLYING GRAPH", "TRANSFER VERTEX METADATA" ]), alignment=:c, - header_alignment=:c, - header_crayon=crayon"yellow bold", - hlines=:all, + column_label_alignment=:c, + style=TextTableStyle(; first_line_column_label=crayon"yellow bold"), + table_format=TextTableFormat(; @text__all_horizontal_lines()), ) return """ From e00e9672593c5c73ffdf5c31a749435fd10d1fdc Mon Sep 17 00:00:00 2001 From: Simone Carlo Surace Date: Mon, 27 Oct 2025 14:32:06 +0100 Subject: [PATCH 2/5] Bump version --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 76d1c7b..f4b676a 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "MultilayerGraphs" uuid = "af984530-d72f-4904-8b81-b992bbbeaf3f" authors = ["Claudio Moroni <43729990+ClaudMor@users.noreply.github.com>", "Pietro Monticone <38562595+pitmonticone@users.noreply.github.com>"] -version = "1.1.4" +version = "1.1.5" [deps] Bijections = "e2ed5e7c-b2de-5872-ae92-c73ca462fb04" From eb78f360818e1a4b38db289067461acd5ea59182 Mon Sep 17 00:00:00 2001 From: Simone Carlo Surace Date: Mon, 27 Oct 2025 14:36:23 +0100 Subject: [PATCH 3/5] Add tests for pretty printing --- test/directed.jl | 4 ++++ test/undirected.jl | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/test/directed.jl b/test/directed.jl index 786f673..7570dfa 100644 --- a/test/directed.jl +++ b/test/directed.jl @@ -239,3 +239,7 @@ for layer in all_layers_d end end end + +@testset "Printing MultilayerDiGraph" begin + @test_nowarn @show multilayergraph +end diff --git a/test/undirected.jl b/test/undirected.jl index c0dcd03..29f637d 100644 --- a/test/undirected.jl +++ b/test/undirected.jl @@ -244,3 +244,7 @@ for layer in all_layers_u end end end + +@testset "Printing MultilayerGraph" begin + @test_nowarn @show multilayergraph +end From 9781dbf3964a6085ddf8eb677c682dac65c8838a Mon Sep 17 00:00:00 2001 From: Simone Carlo Surace Date: Mon, 27 Oct 2025 14:38:10 +0100 Subject: [PATCH 4/5] Fix formatting --- src/abstractmultilayergraph.jl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/abstractmultilayergraph.jl b/src/abstractmultilayergraph.jl index a42cf88..a765578 100644 --- a/src/abstractmultilayergraph.jl +++ b/src/abstractmultilayergraph.jl @@ -1244,8 +1244,7 @@ function to_string(x::AbstractMultilayerGraph) interlayers_underlying_graphs = typeof.(graph.(values(x.interlayers))) interlayer_layer_1s = getproperty.(values(x.interlayers), Ref(:layer_1)) interlayer_layer_2s = getproperty.(values(x.interlayers), Ref(:layer_2)) - interlayer_tranfers = - getproperty.(values(x.interlayers), Ref(:transfer_vertex_metadata)) + interlayer_tranfers = getproperty.(values(x.interlayers), Ref(:transfer_vertex_metadata)) interlayers_table = pretty_table( hcat( From 3df96a52370ed874e1f14031c3162e17978dc4c6 Mon Sep 17 00:00:00 2001 From: Simone Carlo Surace <51025924+simsurace@users.noreply.github.com> Date: Mon, 27 Oct 2025 14:40:12 +0100 Subject: [PATCH 5/5] Update src/abstractmultilayergraph.jl Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- src/abstractmultilayergraph.jl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/abstractmultilayergraph.jl b/src/abstractmultilayergraph.jl index a765578..da9b96d 100644 --- a/src/abstractmultilayergraph.jl +++ b/src/abstractmultilayergraph.jl @@ -1244,7 +1244,9 @@ function to_string(x::AbstractMultilayerGraph) interlayers_underlying_graphs = typeof.(graph.(values(x.interlayers))) interlayer_layer_1s = getproperty.(values(x.interlayers), Ref(:layer_1)) interlayer_layer_2s = getproperty.(values(x.interlayers), Ref(:layer_2)) - interlayer_tranfers = getproperty.(values(x.interlayers), Ref(:transfer_vertex_metadata)) + interlayer_tranfers = getproperty.( + values(x.interlayers), Ref(:transfer_vertex_metadata) + ) interlayers_table = pretty_table( hcat(