dag: do a DFS for each vertex

dag/dag.go

@@ -54,30 +54,28 @@ func (g *AcyclicGraph) Root() (Vertex, error) {
 //
 // Complexity: O(V(V+E)), or asymptotically O(VE)
 func (g *AcyclicGraph) TransitiveReduction() {
-	// Find the root-like objects to start a depthFirstWalk from.
+	// For each vertex u in graph g, do a DFS starting from each vertex
-	frontier := make([]Vertex, 0, 5)
+	// v such that the edge (u,v) exists (v is a direct descendant of u).
-	for _, v := range g.Vertices() {
+	//
-		if g.UpEdges(v).Len() == 0 {
+	// For each v-prime reachable from v, remove the edge (u, v-prime).
-			frontier = append(frontier, v)
+
+	for _, u := range g.Vertices() {
+		uTargets := g.DownEdges(u)
+		vs := make([]Vertex, uTargets.Len())
+		for i, vRaw := range uTargets.List() {
+			vs[i] = vRaw.(Vertex)
 		}
-	}
 
-	// Do a DFS
+		g.depthFirstWalk(vs, func(v Vertex) error {
-	g.depthFirstWalk(frontier, func(v Vertex) error {
+			shared := uTargets.Intersection(g.DownEdges(v))
-		parents := g.UpEdges(v).List()
+			for _, raw := range shared.List() {
-		targets := g.DownEdges(v)
+				vPrime := raw.(Vertex)
-
+				g.RemoveEdge(BasicEdge(u, vPrime))
-		for _, rawParent := range parents {
-			parent := rawParent.(Vertex)
-			shared := g.DownEdges(parent).Intersection(targets)
-			for _, rawTarget := range shared.List() {
-				target := rawTarget.(Vertex)
-				g.RemoveEdge(BasicEdge(parent, target))
 			}
-		}
 
-		return nil
+			return nil
-	})
+		})
+	}
 }
 
 // Validate validates the DAG. A DAG is valid if it has a single root

terraform/graph_builder_test.go

@@ -129,7 +129,6 @@ aws_instance.db (destroy tainted)
   aws_instance.web (destroy tainted)
 aws_instance.web
   aws_instance.db
-  aws_instance.web (destroy tainted)
 aws_instance.web (destroy tainted)
   provider.aws
 provider.aws