Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/di_multigraph_adjlist.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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)])
Expand Down
1 change: 1 addition & 0 deletions src/multigraph_adjlist.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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)])
Expand Down
3 changes: 2 additions & 1 deletion test/di_multigraph_adjlist.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -72,4 +73,4 @@ add_vertex!(g)
@test indegree(g) != outdegree(g)

dmg0 = DiMultigraph(0)
@test nv(dmg0) == ne(dmg0) == 0
@test nv(dmg0) == ne(dmg0) == 0
3 changes: 2 additions & 1 deletion test/multigraph_adjlist.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -68,4 +69,4 @@ add_vertex!(g)
@test indegree(g) == outdegree(g)

mg0 = Multigraph(0)
@test nv(mg0) == ne(mg0) == 0
@test nv(mg0) == ne(mg0) == 0