Simplify RemoveEdge.

echlebek · Jul 24, 2014 · 8a93f9f · 8a93f9f
1 parent 9ea0cfe
commit 8a93f9f
Showing 1 changed file with 9 additions and 18 deletions.
diff --git a/graph.go b/graph.go
@@ -84,23 +84,19 @@ func (g *AdjacencyList) RemoveEdge(u, v Vertex) {
 	if v < u {
 		u, v = v, u
 	}
+
 	vertices, ok := g.edges[u]
 	if !ok {
 		return
 	}
-	var (
-		idx int = -1
-		vtx Vertex
-	)
-	for idx, vtx = range vertices {
+
+	for idx, vtx := range vertices {
 		if vtx == v {
+			// Remove the edge
+			g.edges[u] = append(vertices[:idx], vertices[idx+1:len(vertices)]...)
 			break
 		}
 	}
-	if idx >= 0 {
-		// Remove the edge
-		g.edges[u] = append(vertices[:idx], vertices[idx+1:len(vertices)]...)
-	}
 }
 
 // VertexSlice is a convenience type for sorting vertices by ID.
@@ -184,19 +180,14 @@ func (g *DirectedAdjacencyList) RemoveEdge(u, v Vertex) {
 	if !ok {
 		return
 	}
-	var (
-		idx int = -1
-		vtx Vertex
-	)
-	for idx, vtx = range vertices {
+
+	for idx, vtx := range vertices {
 		if vtx == v {
+			// Remove the edge
+			g.edges[u] = append(vertices[:idx], vertices[idx+1:len(vertices)]...)
 			break
 		}
 	}
-	if idx >= 0 {
-		// Remove the edge
-		g.edges[u] = append(vertices[:idx], vertices[idx+1:len(vertices)]...)
-	}
 }
 
 func (g *DirectedAdjacencyList) AddVertex() Vertex {