Update

Co-Authored-By: Pietro Monticone <38562595+pitmonticone@users.noreply.github.com>
Co-Authored-By: Claudio Moroni <43729990+ClaudMor@users.noreply.github.com>

Author: 3 people

src/MultilayerGraphs.jl

@@ -196,4 +196,4 @@ include("multilayerdigraph.jl")
 include("utilities.jl")
 include("tensorsfactorizations.jl")
 
-end
+end

src/abstractmultilayergraph.jl

@@ -1197,26 +1197,28 @@ end
 
 # Console print utilities
 function to_string(x::AbstractMultilayerGraph)
-    layers_strings     = join(to_string.(x.layers), "\n\n")
-    interlater_strings = join(to_string.(values(x.interlayers)), "\n\n")
+    unionall_type = typeof(x).name.wrapper
+    parameters = typeof(x).parameters
+
     layers_names              = name.(x.layers)
-    layers_underlying_graphs  = typeof.(graph.(x.layers) 
-    layers_eltypes       = eltype(x.layers).parameters
-    layers_vertextypes   = repeat([layers_eltypes[1]], length(x.layers))
-    layers_weighttypes   = repeat([layers_eltypes[2]], length(x.layers))
+    layers_underlying_graphs  = typeof.(graph.(x.layers))
 
-    interlayers_names = name.(values(x.layers))
-    """
-    $(typeof(x))
+    layers_table = pretty_table(String, hcat(layers_names, layers_underlying_graphs); title = "### LAYERS", header = (["NAME", "UNDERLYING GRAPH"]), alignment = :c, header_alignment = :c, header_crayon = crayon"yellow bold", hlines = :all)
 
-    ### LAYERS
+    interlayers_names = name.(values(x.interlayers))
+    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))
 
-    $layers_strings
+    interlayers_table = pretty_table(String, hcat(interlayers_names, interlayer_layer_1s, interlayer_layer_2s, interlayers_underlying_graphs, interlayer_tranfers ); title = "### INTERLAYERS", header = (["NAME", "LAYER 1", "LAYER 2", "UNDERLYING GRAPH", "TRANSFER VERTEX METADATA"]), alignment = :c, header_alignment = :c, header_crayon = crayon"yellow bold", hlines = :all)
 
-    ### INTERLAYERS
+    """
+    `$unionall_type` with vertex type `$(parameters[1])` and weight type `$(parameters[2])`.
 
-    $interlater_strings
+    $layers_table
 
+    $interlayers_table
     """
 end
 Base.show(io::IO, x::AbstractMultilayerGraph) = print(io, to_string(x))

src/subgraphs/interlayer.jl

@@ -94,7 +94,7 @@ Internal constructor used with InterlayerDescriptor.
 function _Interlayer(
     layer_1_multilayervertices::Vector{<:MultilayerVertex},
     layer_2_multilayervertices::Vector{<:MultilayerVertex},
-    edge_list::Union{Vector{<:MultilayerEdge{ <: Union{U,Nothing}}}, Vector{Tuple{<:MultilayerVertex, <:MultilayerVertex}}}, # MultilayerVertex, {<: Union{U, Nothing}} 
+    edge_list::Union{<:Vector{<:MultilayerEdge{ <: Union{U,Nothing}}}, <:Vector{ <: Tuple{<:MultilayerVertex, <:MultilayerVertex}}}, # MultilayerVertex, {<: Union{U, Nothing}} 
     descriptor::InterlayerDescriptor{T,U,G},
 ) where {T<:Integer,U<:Real,G<:AbstractGraph{T}}
 
@@ -127,7 +127,7 @@ function _Interlayer(
         mv_vertices(layer_1), mv_vertices(layer_2), edge_list, descriptor
     ) =#
 
-    return Interlayer(mv_vertices(layer_1), mv_vertices(layer_2), edge_list, descriptor) # , graph, v_V_associations
+    return _Interlayer(mv_vertices(layer_1), mv_vertices(layer_2), edge_list, descriptor) # , graph, v_V_associations
 end
 
 """
@@ -186,8 +186,8 @@ function Interlayer(
     ) =#
 
     descriptor = InterlayerDescriptor(
-        interlayer_name(layer_1),
-        interlayer_name(layer_2),
+        name(layer_1),
+        name(layer_2),
         null_graph,
         U;
         default_edge_weight=default_edge_weight,
@@ -377,7 +377,7 @@ function Interlayer(
     )
 end
 
-"""
+#= """
     _Interlayer(
         layer_1_multilayervertices::Vector{MultilayerVertex{L1}},
         layer_2_multilayervertices::Vector{MultilayerVertex{L2}},
@@ -441,7 +441,7 @@ function _Interlayer(
     return _Interlayer(
         layer_1_multilayervertices, layer_2_multilayervertices, edge_list, descriptor
     )
-end
+end =#
 
 
 
@@ -489,6 +489,8 @@ multiplex_interlayer(
                                                                             interlayer_name = interlayer_name
 )
 
+
+
 """
     _multiplex_interlayer(
         layer_1_multilayervertices::Vector{MultilayerVertex{L1}},
@@ -668,20 +670,19 @@ Constructor for Interlayer whose underlying graph is a `SimpleGraph` from `Graph
 function interlayer_simplegrah(
     layer_1::Layer{T,U},
     layer_2::Layer{T,U},
-    edge_list::Union{<:Vector{<:MultilayerEdge{<:Union{U, Nothing}}}, Vector{NTuple{2, MultilayerVertex}}};
+    edge_list::Union{<:Vector{<:MultilayerEdge{<:Union{U, Nothing}}}, <:Vector{ <:Tuple{<:MultilayerVertex, <:MultilayerVertex}}};
     vertextype::Type{<:Integer} = Int64,
     interlayer_name::Symbol = Symbol("interlayer_$(layer_1.name)_$(layer_2.name)")
 ) where {T<:Integer,U<:Real}
-
+#= 
     layer_1_multilayervertices = collect(mv_vertices(layer_1))
-    layer_2_multilayervertices = collect(mv_vertices(layer_2))
+    layer_2_multilayervertices = collect(mv_vertices(layer_2)) =#
 
-    return _Interlayer(
-        layer_1_multilayervertices,
-        layer_2_multilayervertices,
+    return Interlayer(
+        layer_1,
+        layer_2,
         SimpleGraph{vertextype}(),
-        edge_list,
-        U;
+        edge_list;
         interlayer_name = interlayer_name
     )
 end
@@ -988,14 +989,16 @@ end
 
 # Console print utilities
 function to_string(x::Interlayer)
+    parameters  = typeof(x).parameters
     """
-    $(typeof(x))
-    name: $(name(x))
+    Interlayer\t$(name(x))
     layer_1: $(x.layer_1)
     layer_2: $(x.layer_2)
-    underlying graph: $(x.graph)
-    nv = $(nv(x))
-    ne = $(ne(x))
+    underlying graph: $(typeof(x.graph))
+    vertex type : $(parameters[1]) 
+    weight type : $(parameters[2]) 
+    nv : $(nv(x))
+    ne : $(ne(x))
     """
 end
 Base.show(io::IO, x::Interlayer) = print(io, to_string(x))

src/subgraphs/layer.jl

@@ -1727,11 +1727,12 @@ end
 
 # Console print utilities
 function to_string(x::Layer)
+    parameters = typeof(x).parameters
     """
     Layer\t$(name(x))
     underlying_graph: $(typeof(graph(x)))
-    vertex_type: $(parameters[1])
-    weight_type: $(parameters[2]) 
+    vertex type: $(parameters[1])
+    weight type: $(parameters[2]) 
     nv = $(nv(x))
     ne = $(ne(x))
     """

test/interlayer.jl

@@ -7,7 +7,6 @@ edgetype.(all_interlayers)
 
 for interlayer in all_interlayers
     @test all(has_edge.(Ref(interlayer), edges(interlayer)))
-    println(which(has_vertex, typeof.((interlayer, mv_vertices(interlayer)[1]))))
     @test all(has_vertex.(Ref(interlayer), mv_vertices(interlayer)))
     @test all(has_vertex.(Ref(interlayer), mv_vertices(interlayer)))
     mv = rand(collect(mv_vertices(interlayer)))
@@ -17,6 +16,8 @@ for interlayer in all_interlayers
     # MultilayerGraphs.weights(interlayer)
 end
 
+@debug ""
+
 ne.(all_interlayers)
 nv.(all_interlayers)
 

test/layer.jl

@@ -37,7 +37,7 @@ function _get_srcmv_dstmv_layer(layer::Layer)
 
     return mvs, src_mv, dst_mv
 end
-
+@debug ""
 #= rand_mv_1 =  rand(mv_vertices(layer_sg))
 rand_mv_2 =  rand(mv_vertices(layer_sg)) =#
 

test/runtests.jl

@@ -169,7 +169,7 @@ _nv_1 = nv(layer_sg)
 _nv_2=  nv(layer_swg)
 _ne = rand(1:(_nv_1 * _nv_2))
 interlayer_sg_swg = Interlayer(layer_sg, layer_swg, _ne, SimpleGraph{vertextype}())
-#_interlayer_simplegraph = interlayer_simplegrah(layer_sg, layer_swg, collect(edges(interlayer_sg_swg)))
+_interlayer_simplegraph = interlayer_simplegrah(layer_sg, layer_swg, collect(edges(interlayer_sg_swg)))
 
 _nv_1 = nv(layer_swg)
 _nv_2=  nv(layer_mg)