Make edge-adding variadic: Graph.AddEdge() -> Graph.AddEdges()

directed.go

@@ -22,9 +22,7 @@ func NewDirected() *Directed {
 func NewDirectedFromEdgeSet(set []Edge) *Directed {
 	g := NewDirected()
 
-	for _, edge := range set {
-		g.addEdge(edge)
-	}
+	g.addEdges(set...)
 
 	return g
 }
@@ -120,23 +118,28 @@ func (g *Directed) RemoveVertex(vertices ...Vertex) {
 	return
 }
 
-// Adds a new edge to the graph.
-func (g *Directed) AddEdge(edge Edge) bool {
+// Adds edges to the graph.
+func (g *Directed) AddEdges(edges ...Edge) {
+	if len(edges) == 0 {
+		return
+	}
+
 	g.mu.Lock()
 	defer g.mu.Unlock()
 
-	return g.addEdge(edge)
+	g.addEdges(edges...)
 }
 
 // Adds a new edge to the graph.
-func (g *Directed) addEdge(edge Edge) (exists bool) {
-	g.ensureVertex(edge.Source(), edge.Target())
+func (g *Directed) addEdges(edges ...Edge) {
+	for _, edge := range edges {
+		g.ensureVertex(edge.Source(), edge.Target())
 
-	if _, exists = g.list[edge.Source()][edge.Target()]; !exists {
-		g.list[edge.Source()][edge.Target()] = keyExists
-		g.size++
+		if _, exists := g.list[edge.Source()][edge.Target()]; !exists {
+			g.list[edge.Source()][edge.Target()] = keyExists
+			g.size++
+		}
 	}
-	return !exists
 }
 
 // Removes an edge from the graph. This does NOT remove vertex members of the

directed_test.go

@@ -34,14 +34,14 @@ func TestDensity(t *testing.T) {
 		t.Error("On graph initialize, Density should be NaN (divides zero by zero)).")
 	}
 
-	g.AddEdge(&BaseEdge{"foo", "bar"})
+	g.AddEdges(&BaseEdge{"foo", "bar"})
 
 	density = g.Density()
 	if density != 1 {
 		t.Error("In undirected graph of V = 2 and E = 1, density should be 1; was", density)
 	}
 
-	g.AddEdge(&BaseEdge{"baz", "qux"})
+	g.AddEdges(&BaseEdge{"baz", "qux"})
 
 	density = g.Density()
 	if density != float64(1)/float64(3) {

graph.go

@@ -101,7 +101,7 @@ type MutableGraph interface {
 	Graph
 	EnsureVertex(vertices ...Vertex)
 	RemoveVertex(vertices ...Vertex)
-	AddEdge(edge Edge) bool
+	AddEdges(edges ...Edge)
 	RemoveEdge(edge Edge)
 }
 

graph_test.go

@@ -2,6 +2,7 @@ package gogl
 
 import (
 	"fmt"
+	"github.com/fatih/set"
 	. "launchpad.net/gocheck"
 	"testing"
 )
@@ -149,3 +150,27 @@ func (s *MutableGraphSuite) TestMultiRemoveVertex(c *C) {
 	c.Assert(s.Graph.HasVertex("bar"), Equals, false)
 	c.Assert(s.Graph.HasVertex("baz"), Equals, false)
 }
+
+func (s *MutableGraphSuite) TestAddEdge(c *C) {
+	s.Graph.AddEdges(&BaseEdge{1, 2})
+
+	f := func(e Edge) {
+		c.Assert(BaseEdge{e.Source(), e.Target()}, Equals, BaseEdge{1, 2})
+	}
+
+	s.Graph.EachEdge(f)
+}
+
+func (s *MutableGraphSuite) TestMultiAddEdge(c *C) {
+	s.Graph.AddEdges(&BaseEdge{1, 2}, &BaseEdge{2, 3})
+	set := set.NewNonTS()
+
+	f := func(e Edge) {
+		set.Add(e)
+	}
+
+	s.Graph.EachEdge(f)
+	c.Assert(set.Has(BaseEdge{1, 2}), Equals, true)
+	c.Assert(set.Has(BaseEdge{2, 3}), Equals, true)
+}
+

undirected.go

@@ -26,7 +26,7 @@ func NewUndirectedFromEdgeSet(set []Edge) *Undirected {
 	g := NewUndirected()
 
 	for _, edge := range set {
-		g.addEdge(edge)
+		g.addEdges(edge)
 	}
 
 	return g
@@ -103,24 +103,29 @@ func (g *Undirected) RemoveVertex(vertices ...Vertex) {
 	return
 }
 
-// Adds a new edge to the graph.
-func (g *Undirected) AddEdge(edge Edge) bool {
+// Adds edges to the graph.
+func (g *Undirected) AddEdges(edges ...Edge) {
+	if len(edges) == 0 {
+		return
+	}
+
 	g.mu.Lock()
 	defer g.mu.Unlock()
 
-	return g.addEdge(edge)
+	g.addEdges(edges...)
 }
 
 // Adds a new edge to the graph.
-func (g *Undirected) addEdge(edge Edge) (exists bool) {
-	g.ensureVertex(edge.Source(), edge.Target())
-
-	if _, exists = g.list[edge.Source()][edge.Target()]; !exists {
-		g.list[edge.Source()][edge.Target()] = keyExists
-		g.list[edge.Target()][edge.Source()] = keyExists
-		g.size++
+func (g *Undirected) addEdges(edges ...Edge) {
+	for _, edge := range edges {
+		g.ensureVertex(edge.Source(), edge.Target())
+
+		if _, exists := g.list[edge.Source()][edge.Target()]; !exists {
+			g.list[edge.Source()][edge.Target()] = keyExists
+			g.list[edge.Target()][edge.Source()] = keyExists
+			g.size++
+		}
 	}
-	return !exists
 }
 
 // Removes an edge from the graph. This does NOT remove vertex members of the