Skip to content
This repository has been archived by the owner on Apr 26, 2019. It is now read-only.

Commit

Permalink
{network,search,traverse}: remove unnecessary node additions
Browse files Browse the repository at this point in the history 
Some tests depend on all nodes being present, so we need to keep the
outer loop AddNode call.
  • Loading branch information
@kortschak
kortschak committed May 28, 2015
1 parent 60b5849 commit 031fcc0
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 45 deletions.
8 changes: 2 additions & 6 deletions network/betweenness_test.go
View file
Expand Up @@ -121,13 +121,11 @@ func TestBetweenness(t *testing.T) {
for i, test := range betweennessTests {
g := concrete.NewGraph()
for u, e := range test.g {
// Add nodes that are not been defined by an edge.
if !g.NodeExists(concrete.Node(u)) {
g.AddNode(concrete.Node(u))
}
for v := range e {
if !g.NodeExists(concrete.Node(v)) {
g.AddNode(concrete.Node(v))
}
g.AddUndirectedEdge(concrete.Edge{F: concrete.Node(u), T: concrete.Node(v)}, 0)
}
}
Expand All @@ -152,13 +150,11 @@ func TestBetweennessWeighted(t *testing.T) {
for i, test := range betweennessTests {
g := concrete.NewGraph()
for u, e := range test.g {
// Add nodes that are not been defined by an edge.
if !g.NodeExists(concrete.Node(u)) {
g.AddNode(concrete.Node(u))
}
for v := range e {
if !g.NodeExists(concrete.Node(v)) {
g.AddNode(concrete.Node(v))
}
g.AddUndirectedEdge(concrete.Edge{F: concrete.Node(u), T: concrete.Node(v)}, 1)
}
}
Expand Down
8 changes: 2 additions & 6 deletions network/distance_test.go
View file
Expand Up @@ -145,13 +145,11 @@ func TestDistanceCentralityUndirected(t *testing.T) {
for i, test := range undirectedCentralityTests {
g := concrete.NewGraph()
for u, e := range test.g {
// Add nodes that are not been defined by an edge.
if !g.NodeExists(concrete.Node(u)) {
g.AddNode(concrete.Node(u))
}
for v := range e {
if !g.NodeExists(concrete.Node(v)) {
g.AddNode(concrete.Node(v))
}
g.AddUndirectedEdge(concrete.Edge{F: concrete.Node(u), T: concrete.Node(v)}, 1)
}
}
Expand Down Expand Up @@ -337,13 +335,11 @@ func TestDistanceCentralityDirected(t *testing.T) {
for i, test := range directedCentralityTests {
g := concrete.NewDirectedGraph()
for u, e := range test.g {
// Add nodes that are not been defined by an edge.
if !g.NodeExists(concrete.Node(u)) {
g.AddNode(concrete.Node(u))
}
for v := range e {
if !g.NodeExists(concrete.Node(v)) {
g.AddNode(concrete.Node(v))
}
g.AddDirectedEdge(concrete.Edge{F: concrete.Node(u), T: concrete.Node(v)}, 1)
}
}
Expand Down
4 changes: 1 addition & 3 deletions network/hits_test.go
View file
Expand Up @@ -45,13 +45,11 @@ func TestHITS(t *testing.T) {
for i, test := range hitsTests {
g := concrete.NewDirectedGraph()
for u, e := range test.g {
// Add nodes that are not been defined by an edge.
if !g.NodeExists(concrete.Node(u)) {
g.AddNode(concrete.Node(u))
}
for v := range e {
if !g.NodeExists(concrete.Node(v)) {
g.AddNode(concrete.Node(v))
}
g.AddDirectedEdge(concrete.Edge{F: concrete.Node(u), T: concrete.Node(v)}, 0)
}
}
Expand Down
8 changes: 2 additions & 6 deletions network/page_test.go
View file
Expand Up @@ -83,13 +83,11 @@ func TestPageRank(t *testing.T) {
for i, test := range pageRankTests {
g := concrete.NewDirectedGraph()
for u, e := range test.g {
// Add nodes that are not been defined by an edge.
if !g.NodeExists(concrete.Node(u)) {
g.AddNode(concrete.Node(u))
}
for v := range e {
if !g.NodeExists(concrete.Node(v)) {
g.AddNode(concrete.Node(v))
}
g.AddDirectedEdge(concrete.Edge{F: concrete.Node(u), T: concrete.Node(v)}, 0)
}
}
Expand All @@ -109,13 +107,11 @@ func TestPageRankSparse(t *testing.T) {
for i, test := range pageRankTests {
g := concrete.NewDirectedGraph()
for u, e := range test.g {
// Add nodes that are not been defined by an edge.
if !g.NodeExists(concrete.Node(u)) {
g.AddNode(concrete.Node(u))
}
for v := range e {
if !g.NodeExists(concrete.Node(v)) {
g.AddNode(concrete.Node(v))
}
g.AddDirectedEdge(concrete.Edge{F: concrete.Node(u), T: concrete.Node(v)}, 0)
}
}
Expand Down
4 changes: 1 addition & 3 deletions search/johnson_cycles_test.go
View file
Expand Up @@ -89,13 +89,11 @@ func TestCyclesIn(t *testing.T) {
g := concrete.NewDirectedGraph()
g.AddNode(concrete.Node(-10)) // Make sure we test graphs with sparse IDs.
for u, e := range test.g {
// Add nodes that are not been defined by an edge.
if !g.NodeExists(concrete.Node(u)) {
g.AddNode(concrete.Node(u))
}
for v := range e {
if !g.NodeExists(concrete.Node(v)) {
g.AddNode(concrete.Node(v))
}
g.AddDirectedEdge(concrete.Edge{F: concrete.Node(u), T: concrete.Node(v)}, 0)
}
}
Expand Down
16 changes: 4 additions & 12 deletions search/search_test.go
View file
Expand Up @@ -376,13 +376,11 @@ func TestTarjanSCC(t *testing.T) {
for i, test := range tarjanTests {
g := concrete.NewDirectedGraph()
for u, e := range test.g {
// Add nodes that are not been defined by an edge.
if !g.NodeExists(concrete.Node(u)) {
g.AddNode(concrete.Node(u))
}
for v := range e {
if !g.NodeExists(concrete.Node(v)) {
g.AddNode(concrete.Node(v))
}
g.AddDirectedEdge(concrete.Edge{F: concrete.Node(u), T: concrete.Node(v)}, 0)
}
}
Expand Down Expand Up @@ -474,13 +472,11 @@ func TestVertexOrdering(t *testing.T) {
for i, test := range vOrderTests {
g := concrete.NewGraph()
for u, e := range test.g {
// Add nodes that are not been defined by an edge.
if !g.NodeExists(concrete.Node(u)) {
g.AddNode(concrete.Node(u))
}
for v := range e {
if !g.NodeExists(concrete.Node(v)) {
g.AddNode(concrete.Node(v))
}
g.AddUndirectedEdge(concrete.Edge{F: concrete.Node(u), T: concrete.Node(v)}, 0)
}
}
Expand Down Expand Up @@ -561,13 +557,11 @@ func TestBronKerbosch(t *testing.T) {
for i, test := range bronKerboschTests {
g := concrete.NewGraph()
for u, e := range test.g {
// Add nodes that are not been defined by an edge.
if !g.NodeExists(concrete.Node(u)) {
g.AddNode(concrete.Node(u))
}
for v := range e {
if !g.NodeExists(concrete.Node(v)) {
g.AddNode(concrete.Node(v))
}
g.AddUndirectedEdge(concrete.Edge{F: concrete.Node(u), T: concrete.Node(v)}, 0)
}
}
Expand Down Expand Up @@ -613,13 +607,11 @@ func TestConnectedComponents(t *testing.T) {
}

for u, e := range test.g {
// Add nodes that are not been defined by an edge.
if !g.NodeExists(concrete.Node(u)) {
g.(graph.Mutable).AddNode(concrete.Node(u))
}
for v := range e {
if !g.NodeExists(concrete.Node(v)) {
g.(graph.Mutable).AddNode(concrete.Node(v))
}
switch g := g.(type) {
case graph.MutableDirectedGraph:
g.AddDirectedEdge(concrete.Edge{F: concrete.Node(u), T: concrete.Node(v)}, 0)
Expand Down
12 changes: 3 additions & 9 deletions traverse/traverse_test.go
View file
Expand Up @@ -135,13 +135,11 @@ func TestBreadthFirst(t *testing.T) {
for i, test := range breadthFirstTests {
g := concrete.NewGraph()
for u, e := range test.g {
// Add nodes that are not been defined by an edge.
if !g.NodeExists(concrete.Node(u)) {
g.AddNode(concrete.Node(u))
}
for v := range e {
if !g.NodeExists(concrete.Node(v)) {
g.AddNode(concrete.Node(v))
}
g.AddUndirectedEdge(concrete.Edge{F: concrete.Node(u), T: concrete.Node(v)}, 0)
}
}
Expand Down Expand Up @@ -225,13 +223,11 @@ func TestDepthFirst(t *testing.T) {
for i, test := range depthFirstTests {
g := concrete.NewGraph()
for u, e := range test.g {
// Add nodes that are not been defined by an edge.
if !g.NodeExists(concrete.Node(u)) {
g.AddNode(concrete.Node(u))
}
for v := range e {
if !g.NodeExists(concrete.Node(v)) {
g.AddNode(concrete.Node(v))
}
g.AddUndirectedEdge(concrete.Edge{F: concrete.Node(u), T: concrete.Node(v)}, 0)
}
}
Expand Down Expand Up @@ -295,13 +291,11 @@ func TestWalkAll(t *testing.T) {
}

for u, e := range test.g {
// Add nodes that are not been defined by an edge.
if !g.NodeExists(concrete.Node(u)) {
g.(graph.Mutable).AddNode(concrete.Node(u))
}
for v := range e {
if !g.NodeExists(concrete.Node(v)) {
g.(graph.Mutable).AddNode(concrete.Node(v))
}
switch g := g.(type) {
case graph.MutableDirectedGraph:
g.AddDirectedEdge(concrete.Edge{F: concrete.Node(u), T: concrete.Node(v)}, 0)
Expand Down

0 comments on commit 031fcc0

Please sign in to comment.