Update docs, minor fixes, fix tests.

Co-Authored-By: Pietro Monticone <[email protected]>
Co-Authored-By: Claudio Moroni <[email protected]>

Author: 3 people

docs/src/API.md

@@ -205,8 +205,34 @@ nl(mg::AbstractMultilayerGraph)
 nIn(mg::AbstractMultilayerGraph)
 has_layer(mg::AbstractMultilayerGraph, layer_name::Symbol)
 
-add_layer!(::Type{SimpleTraits.Not{Graphs.IsDirected{M}}}, mg::M, new_layer::L; default_interlayers_null_graph, default_interlayers_structure) where {T, U, G<:Graphs.AbstractGraph{T}, L<:Layer{T, U, G}, M<:MultilayerGraph{T, U}}
-add_layer!(::Type{Graphs.IsDirected{M}}, mg::M, new_layer::L; default_interlayers_null_graph, default_interlayers_structure) where {T, U, G<:Graphs.AbstractGraph{T}, L<:Layer{T, U, G}, M<:MultilayerDiGraph{T, U}}
+add_layer!(
+    mg::M,
+    new_layer::L;
+    default_interlayers_null_graph::H=SimpleGraph{T}(),
+    default_interlayers_structure::String="multiplex",
+) where {
+    T,
+    U,
+    G<:AbstractGraph{T},
+    L<:Layer{T,U,G},
+    H<:AbstractGraph{T},
+    M<:MultilayerGraph{T,U}
+}
+
+add_layer!(
+    mg::M,
+    new_layer::L;
+    default_interlayers_null_graph::H=SimpleDiGraph{T}(),
+    default_interlayers_structure::String="multiplex",
+) where {
+    T,
+    U,
+    G<:AbstractGraph{T},
+    L<:Layer{T,U,G},
+    H<:AbstractGraph{T},
+    M<:MultilayerDiGraph{T,U}
+}
+
 specify_interlayer!(::Type{SimpleTraits.Not{Graphs.IsDirected{M}}}, mg::M, new_interlayer::In) where {T, U, G<:Graphs.AbstractGraph{T}, In<:Interlayer{T, U, G}, M<:MultilayerGraph{T, U}}
  specify_interlayer!(::Type{Graphs.IsDirected{M}}, mg::M, new_interlayer::In) where {T, U, G<:Graphs.AbstractGraph{T}, In<:Interlayer{T, U, G}, M<:MultilayerDiGraph{T, U}}
 

src/abstractmultilayergraph.jl

@@ -640,8 +640,8 @@ end
 Get the vector of indegrees of vertices `vs` in `mg`.
 """
 function Graphs.indegree(
-    mg::AbstractMultilayerGraph, vs::AbstractVector{V}=vertices(mg)
-) where {V<:MultilayerVertex}
+    mg::AbstractMultilayerGraph, vs::AbstractVector{<:MultilayerVertex}=mv_vertices(mg)
+)
     return [indegree(mg, x) for x in vs]
 end
 
@@ -660,7 +660,7 @@ end
 Get the vector of outdegrees of vertices `vs` in `mg`.
 """
 function Graphs.outdegree(
-    mg::AbstractMultilayerGraph, vs::AbstractVector{<:MultilayerVertex}=vertices(mg)
+    mg::AbstractMultilayerGraph, vs::AbstractVector{<:MultilayerVertex}=mv_vertices(mg)
 )
     return [outdegree(mg, x) for x in vs]
 end
@@ -671,9 +671,9 @@ end
 Get the degree of vertices `vs` in `mg`.
 """
 function Graphs.degree(
-    mg::AbstractMultilayerGraph, vs::AbstractVector{<:MultilayerVertex}=vertices(mg)
+    mg::AbstractMultilayerGraph, vs::AbstractVector{<:MultilayerVertex}=mv_vertices(mg)
 )
-    return [degree(mg, x) for x in vs]
+    return degree.(Ref(mg), vs)
 end
 
 """

src/multilayerdigraph.jl

@@ -304,7 +304,7 @@ Add layer `layer` to `mg`.
 function add_layer!(
     mg::M,
     new_layer::L;
-    default_interlayers_null_graph::H=SimpleGraph{T}(),
+    default_interlayers_null_graph::H=SimpleDiGraph{T}(),
     default_interlayers_structure::String="multiplex",
 ) where {
     T,

test/abstractmultilayerdigraph.jl renamed to test/directed.jl

@@ -163,9 +163,9 @@ mt = metadata_tensor(multilayerdigraph)
     indegree(multilayerdigraph) .+ outdegree(multilayerdigraph) .==
     degree(multilayerdigraph),
 )
-@inferred(mean_degree(multilayerdigraph))
-@inferred(degree_second_moment(multilayerdigraph))
-@inferred(degree_variance(multilayerdigraph))
+mean_degree(multilayerdigraph)
+degree_second_moment(multilayerdigraph)
+degree_variance(multilayerdigraph)
 
 # Test multilayer-specific methods
 @test all(

test/runtests.jl

@@ -483,21 +483,20 @@ all_interlayers = [
     interlayer_empty_sdg_vdg,
 ]
 
-@debug "runtests finished"
 @testset verbose = true "MultilayerGraphs" begin
     @testset "layer" begin
         include("layer.jl")
     end
-    @debug "layer finished"
+
     @testset "interlayer" begin
         include("interlayer.jl")
     end
-    @debug "interlayer finished"
-    @testset "abstractmultilayerugraph" begin
-        include("abstractmultilayerugraph.jl")
+   
+    @testset "undirected" begin
+        include("undirected.jl")
     end
-    @testset "abstractmultilayerdigraph" begin
-        include("abstractmultilayerdigraph.jl")
+    @testset "directed" begin
+        include("directed.jl")
     end
     @testset "node_aligned_edge_colored_graphs" begin
         include("node_aligned_edge_colored_graph.jl")

test/abstractmultilayerugraph.jl renamed to test/undirected.jl

@@ -165,9 +165,9 @@ mt = metadata_tensor(multilayergraph)
 # Test Graphs.jl extra overrides
 @test all(indegree(multilayergraph) .== degree(multilayergraph)) #.+ outdegree(multilayergraph)
 
-@inferred(mean_degree(multilayergraph))
-@inferred(degree_second_moment(multilayergraph))
-@inferred(degree_variance(multilayergraph))
+mean_degree(multilayergraph)
+degree_second_moment(multilayergraph)
+degree_variance(multilayergraph)
 
 # Test multilayer-specific methods
 @test all(