Skip to content

Commit e53851f

Browse files
Remove non-default GenericGraph constructor (#308)
1 parent 15e6640 commit e53851f

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

src/Test/Test.jl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ struct GenericGraph{T} <: Graphs.AbstractGraph{T}
3636
g::SimpleGraph{T}
3737
end
3838

39-
function GenericGraph(elist::Vector{Graphs.SimpleGraphEdge{T}}) where {T<:Integer}
40-
return GenericGraph{T}(SimpleGraph(elist))
41-
end
42-
4339
"""
4440
GenericDiGraph{T} <: Graphs.AbstractGraph{T}
4541

test/traversals/eulerian.jl

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
11
@testset "Eulerian tours/cycles" begin
22
# a cycle (identical start/end)
3-
g0 = GenericGraph([Edge(1,2), Edge(2,3), Edge(3,1)])
3+
g0 = GenericGraph(SimpleGraph([Edge(1,2), Edge(2,3), Edge(3,1)]))
44
@test eulerian(g0, 1) == eulerian(g0)
55
@test last(eulerian(g0, 1)) == 1 # a cycle
66

77
# a tour (different start/end)
8-
g1 = GenericGraph([Edge(1,2), Edge(2,3), Edge(3,4)])
8+
g1 = GenericGraph(SimpleGraph([Edge(1,2), Edge(2,3), Edge(3,4)]))
99
@test eulerian(g1, 1) == [1,2,3,4]
1010
@test_throws ErrorException("starting vertex has even degree but there are other vertices with odd degree: a eulerian cycle does not exist") eulerian(g1, 2)
1111

1212
# a cycle with a node (vertex 2) with multiple neighbors
13-
g2 = GenericGraph([Edge(1,2), Edge(2,3), Edge(3,4), Edge(4,1), Edge(2,5), Edge(5,6),
14-
Edge(6,2)])
13+
g2 = GenericGraph(SimpleGraph([Edge(1,2), Edge(2,3), Edge(3,4), Edge(4,1), Edge(2,5), Edge(5,6), Edge(6,2)]))
1514
@test eulerian(g2) == eulerian(g2, 1) == [1, 2, 5, 6, 2, 3, 4, 1]
1615

1716
# graph with odd-degree vertices
18-
g3 = GenericGraph([Edge(1,2), Edge(2,3), Edge(3,4), Edge(2,4), Edge(4,1), Edge(4,2)])
17+
g3 = GenericGraph(SimpleGraph([Edge(1,2), Edge(2,3), Edge(3,4), Edge(2,4), Edge(4,1), Edge(4,2)]))
1918
@test_throws ErrorException("starting vertex has even degree but there are other vertices with odd degree: a eulerian cycle does not exist") eulerian(g3, 1)
2019

2120
# start/end point not in graph
2221
@test_throws ErrorException("starting vertex is not in the graph") eulerian(g3, 5)
2322

2423
# disconnected components
25-
g4 = GenericGraph([Edge(1,2), Edge(2,3), Edge(3,1), # component 1
26-
Edge(4,5), Edge(5,6), Edge(6,4)]) # component 2
24+
g4 = GenericGraph(SimpleGraph([Edge(1,2), Edge(2,3), Edge(3,1), # component 1
25+
Edge(4,5), Edge(5,6), Edge(6,4)])) # component 2
2726
@test_throws ErrorException("graph is not connected: a eulerian cycle/trail does not exist") eulerian(g4)
2827

2928
# zero-degree nodes
@@ -34,4 +33,4 @@
3433

3534
# not yet implemented for directed graphs
3635
@test_broken eulerian(GenericDiGraph([Edge(1,2), Edge(2,3), Edge(3,1)]))
37-
end
36+
end

0 commit comments

Comments
 (0)