From 2537441d39735c032456095efd2622bc74ba6d6c Mon Sep 17 00:00:00 2001 From: fchrstou Date: Thu, 26 Jan 2023 23:18:58 +0100 Subject: [PATCH] Satisfy trait type condition --- src/di_multigraph_adjlist.jl | 1 + src/multigraph_adjlist.jl | 1 + test/di_multigraph_adjlist.jl | 3 ++- test/multigraph_adjlist.jl | 3 ++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/di_multigraph_adjlist.jl b/src/di_multigraph_adjlist.jl index 6f587c0..a6d552c 100644 --- a/src/di_multigraph_adjlist.jl +++ b/src/di_multigraph_adjlist.jl @@ -165,6 +165,7 @@ function mul(mg::DiMultigraph, s::Integer, d::Integer) end is_directed(mg::DiMultigraph) = true +is_directed(mg::Type{<:DiMultigraph}) = true function ne(mg::DiMultigraph; count_mul::Bool = false) if count_mul return sum([length(mg.adjlist[v]) for v in vertices(mg)]) diff --git a/src/multigraph_adjlist.jl b/src/multigraph_adjlist.jl index 2fe2944..7119b58 100644 --- a/src/multigraph_adjlist.jl +++ b/src/multigraph_adjlist.jl @@ -152,6 +152,7 @@ function mul(mg::Multigraph, s::Integer, d::Integer) end is_directed(mg::Multigraph) = false +is_directed(mg::Type{<:Multigraph}) = false function ne(mg::Multigraph; count_mul::Bool = false) if count_mul return sum([sum(mg.adjlist[v] .>= v) for v in vertices(mg)]) diff --git a/test/di_multigraph_adjlist.jl b/test/di_multigraph_adjlist.jl index a158ff3..f11ed18 100644 --- a/test/di_multigraph_adjlist.jl +++ b/test/di_multigraph_adjlist.jl @@ -40,6 +40,7 @@ g1 = DiMultigraph(path_digraph(3)) @test adjacency_matrix(g) == m @test is_directed(g) +@test is_directed(typeof(g)) @test edgetype(g) == MultipleEdge{Int, Int} @test size(adjacency_matrix(g), 1) == 4 @@ -72,4 +73,4 @@ add_vertex!(g) @test indegree(g) != outdegree(g) dmg0 = DiMultigraph(0) -@test nv(dmg0) == ne(dmg0) == 0 \ No newline at end of file +@test nv(dmg0) == ne(dmg0) == 0 diff --git a/test/multigraph_adjlist.jl b/test/multigraph_adjlist.jl index 19fc409..88a5645 100644 --- a/test/multigraph_adjlist.jl +++ b/test/multigraph_adjlist.jl @@ -39,6 +39,7 @@ g1 = Multigraph(path_graph(3)) @test adjacency_matrix(g) == m @test !is_directed(g) +@test !is_directed(typeof(g)) @test edgetype(g) == MultipleEdge{Int, Int} @test size(adjacency_matrix(g), 1) == 4 @@ -68,4 +69,4 @@ add_vertex!(g) @test indegree(g) == outdegree(g) mg0 = Multigraph(0) -@test nv(mg0) == ne(mg0) == 0 \ No newline at end of file +@test nv(mg0) == ne(mg0) == 0