Skip to content

Commit 5d11642

Browse files
InterdisciplinaryPhysicsTeampitmonticoneClaudMor
committed
Update docs, minor fixes, fix tests.
Co-Authored-By: Pietro Monticone <38562595+pitmonticone@users.noreply.github.com> Co-Authored-By: Claudio Moroni <43729990+ClaudMor@users.noreply.github.com>
1 parent 6bc3dbc commit 5d11642

File tree

6 files changed

+46
-21
lines changed

6 files changed

+46
-21
lines changed

‎docs/src/API.md‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,34 @@ nl(mg::AbstractMultilayerGraph)
205205
nIn(mg::AbstractMultilayerGraph)
206206
has_layer(mg::AbstractMultilayerGraph, layer_name::Symbol)
207207
208-
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}}
209-
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}}
208+
add_layer!(
209+
mg::M,
210+
new_layer::L;
211+
default_interlayers_null_graph::H=SimpleGraph{T}(),
212+
default_interlayers_structure::String="multiplex",
213+
) where {
214+
T,
215+
U,
216+
G<:AbstractGraph{T},
217+
L<:Layer{T,U,G},
218+
H<:AbstractGraph{T},
219+
M<:MultilayerGraph{T,U}
220+
}
221+
222+
add_layer!(
223+
mg::M,
224+
new_layer::L;
225+
default_interlayers_null_graph::H=SimpleDiGraph{T}(),
226+
default_interlayers_structure::String="multiplex",
227+
) where {
228+
T,
229+
U,
230+
G<:AbstractGraph{T},
231+
L<:Layer{T,U,G},
232+
H<:AbstractGraph{T},
233+
M<:MultilayerDiGraph{T,U}
234+
}
235+
210236
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}}
211237
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}}
212238

‎src/abstractmultilayergraph.jl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -640,8 +640,8 @@ end
640640
Get the vector of indegrees of vertices `vs` in `mg`.
641641
"""
642642
function Graphs.indegree(
643-
mg::AbstractMultilayerGraph, vs::AbstractVector{V}=vertices(mg)
644-
) where {V<:MultilayerVertex}
643+
mg::AbstractMultilayerGraph, vs::AbstractVector{<:MultilayerVertex}=mv_vertices(mg)
644+
)
645645
return [indegree(mg, x) for x in vs]
646646
end
647647

@@ -660,7 +660,7 @@ end
660660
Get the vector of outdegrees of vertices `vs` in `mg`.
661661
"""
662662
function Graphs.outdegree(
663-
mg::AbstractMultilayerGraph, vs::AbstractVector{<:MultilayerVertex}=vertices(mg)
663+
mg::AbstractMultilayerGraph, vs::AbstractVector{<:MultilayerVertex}=mv_vertices(mg)
664664
)
665665
return [outdegree(mg, x) for x in vs]
666666
end
@@ -671,9 +671,9 @@ end
671671
Get the degree of vertices `vs` in `mg`.
672672
"""
673673
function Graphs.degree(
674-
mg::AbstractMultilayerGraph, vs::AbstractVector{<:MultilayerVertex}=vertices(mg)
674+
mg::AbstractMultilayerGraph, vs::AbstractVector{<:MultilayerVertex}=mv_vertices(mg)
675675
)
676-
return [degree(mg, x) for x in vs]
676+
return degree.(Ref(mg), vs)
677677
end
678678

679679
"""

‎src/multilayerdigraph.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ Add layer `layer` to `mg`.
304304
function add_layer!(
305305
mg::M,
306306
new_layer::L;
307-
default_interlayers_null_graph::H=SimpleGraph{T}(),
307+
default_interlayers_null_graph::H=SimpleDiGraph{T}(),
308308
default_interlayers_structure::String="multiplex",
309309
) where {
310310
T,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ mt = metadata_tensor(multilayerdigraph)
163163
indegree(multilayerdigraph) .+ outdegree(multilayerdigraph) .==
164164
degree(multilayerdigraph),
165165
)
166-
@inferred(mean_degree(multilayerdigraph))
167-
@inferred(degree_second_moment(multilayerdigraph))
168-
@inferred(degree_variance(multilayerdigraph))
166+
mean_degree(multilayerdigraph)
167+
degree_second_moment(multilayerdigraph)
168+
degree_variance(multilayerdigraph)
169169

170170
# Test multilayer-specific methods
171171
@test all(

‎test/runtests.jl‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -483,21 +483,20 @@ all_interlayers = [
483483
interlayer_empty_sdg_vdg,
484484
]
485485

486-
@debug "runtests finished"
487486
@testset verbose = true "MultilayerGraphs" begin
488487
@testset "layer" begin
489488
include("layer.jl")
490489
end
491-
@debug "layer finished"
490+
492491
@testset "interlayer" begin
493492
include("interlayer.jl")
494493
end
495-
@debug "interlayer finished"
496-
@testset "abstractmultilayerugraph" begin
497-
include("abstractmultilayerugraph.jl")
494+
495+
@testset "undirected" begin
496+
include("undirected.jl")
498497
end
499-
@testset "abstractmultilayerdigraph" begin
500-
include("abstractmultilayerdigraph.jl")
498+
@testset "directed" begin
499+
include("directed.jl")
501500
end
502501
@testset "node_aligned_edge_colored_graphs" begin
503502
include("node_aligned_edge_colored_graph.jl")

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,9 @@ mt = metadata_tensor(multilayergraph)
165165
# Test Graphs.jl extra overrides
166166
@test all(indegree(multilayergraph) .== degree(multilayergraph)) #.+ outdegree(multilayergraph)
167167

168-
@inferred(mean_degree(multilayergraph))
169-
@inferred(degree_second_moment(multilayergraph))
170-
@inferred(degree_variance(multilayergraph))
168+
mean_degree(multilayergraph)
169+
degree_second_moment(multilayergraph)
170+
degree_variance(multilayergraph)
171171

172172
# Test multilayer-specific methods
173173
@test all(

0 commit comments

Comments
 (0)