func Adj() []int to Adj() fund.Iterator

Author: youngzhu

graphs/graph/breadth_first_paths.go

@@ -1,15 +1,15 @@
 package graph
 
 import (
-	"github.com/youngzhu/algs4-go/graphs"
 	"github.com/youngzhu/algs4-go/fund"
+	"github.com/youngzhu/algs4-go/graphs"
 )
 
 // Breadth-first search.
 // Depth-first search finds some path from a source vertex s to a target vertex v.
-// We are often interested in finding the shortest such path (one with a minimal 
+// We are often interested in finding the shortest such path (one with a minimal
 // number of edges). Breadth-first search is a classic method based on this goal.
-// To find a shortest path from s to v, we start at s and check for v among all 
+// To find a shortest path from s to v, we start at s and check for v among all
 // the vertices that we can reach by following one edge, then we check for v among
 // all the vertices that we can reach from s by following two edges, and so forth.
 
@@ -20,14 +20,14 @@ import (
 // 2. Put onto the queue all unmarked vertices that are adjacent to v and mark them
 
 type BreadthFirstPaths struct {
-	graph Graph
-	source int // source vertex
+	graph  Graph
+	source int    // source vertex
 	marked []bool // marked[v]: is there an s-v path?
-	edgeTo []int // edgeTo[v]: previous edge on shortest s-v path
-	distTo []int // distTo[v]: number of edges on shortest s-v path
+	edgeTo []int  // edgeTo[v]: previous edge on shortest s-v path
+	distTo []int  // distTo[v]: number of edges on shortest s-v path
 }
 
-// Computes the shortest path between the source vertex (s) 
+// Computes the shortest path between the source vertex (s)
 // and every other vertex in graph g
 func NewBreadthFirstPaths(g Graph, s int) BreadthFirstPaths {
 	g.validateVertex(s)
@@ -57,7 +57,8 @@ func (p BreadthFirstPaths) bfs() {
 	for !queue.IsEmpty() {
 		v := queue.Dequeue().(int)
 
-		for _, w := range p.graph.Adj(v) {
+		for _, ww := range p.graph.Adj(v) {
+			w := ww.(int)
 			if !p.marked[w] {
 				p.marked[w] = true
 				p.edgeTo[w] = v
@@ -103,4 +104,4 @@ func (p BreadthFirstPaths) PathTo(v int) []int {
 	}
 
 	return path
-}
+}

graphs/graph/connected_components.go

@@ -2,11 +2,11 @@ package graph
 
 // Another client of DFS, find the connected components of a graph.
 type ConnectedComponents struct {
-	graph Graph
+	graph  Graph
 	marked []bool // makred[v]: has vertex v been marked?
-	id []int // id[v]: id of connected component containing v
-	size []int // size[id]: number of vertices in given component
-	count int // number of connected components
+	id     []int  // id[v]: id of connected component containing v
+	size   []int  // size[id]: number of vertices in given component
+	count  int    // number of connected components
 }
 
 func NewConnectedComponents(g Graph) ConnectedComponents {
@@ -30,7 +30,8 @@ func (cc ConnectedComponents) dfs(v int) {
 	cc.marked[v] = true
 	cc.id[v] = cc.count
 	cc.size[cc.count]++
-	for _, w := range cc.graph.Adj(v) {
+	for _, ww := range cc.graph.Adj(v) {
+		w := ww.(int)
 		if !cc.marked[w] {
 			cc.dfs(w)
 		}

graphs/graph/depth_first_paths.go

@@ -2,16 +2,16 @@ package graph
 
 import "github.com/youngzhu/algs4-go/fund"
 
-// We remember the edge v-w that takes us to each vertex w for the first time 
+// We remember the edge v-w that takes us to each vertex w for the first time
 // by setting edge[w] to v. In other words, v-w is the last edge on the known
 // path from s to w. The result of the search is a tree rooted at the source;
 // edgeTo[] is a parent-link representation of that tree.
 
 type DepthFirstPaths struct {
-	graph Graph
-	source int // source vertex
+	graph  Graph
+	source int    // source vertex
 	marked []bool // marked[v]: is there an s-v path?
-	edgeTo []int // edgeTo[v]: last edge on s-v path
+	edgeTo []int  // edgeTo[v]: last edge on s-v path
 }
 
 // Computes a path between the source vertex (s) and every other vertex in graph g
@@ -31,7 +31,8 @@ func NewDepthFirstPaths(g Graph, s int) DepthFirstPaths {
 func (p DepthFirstPaths) dfs(g Graph, v int) {
 	p.marked[v] = true
 
-	for _, w := range g.Adj(v) {
+	for _, ww := range g.Adj(v) {
+		w := ww.(int)
 		if !p.marked[w] {
 			p.edgeTo[w] = v
 			p.dfs(g, w)
@@ -67,4 +68,4 @@ func (p DepthFirstPaths) PathTo(v int) []int {
 	}
 
 	return path
-}
+}

graphs/graph/depth_first_search.go

@@ -9,7 +9,7 @@ package graph
 
 type DepthFirstSearch struct {
 	marked []bool // marked[v]: is there an s-v path?
-	count int // number of vertices connected to s
+	count  int    // number of vertices connected to s
 }
 
 // Computes the vertices in graph (g) that are connected to
@@ -29,7 +29,8 @@ func (d DepthFirstSearch) dfs(g Graph, s int) {
 	d.count++
 	d.marked[s] = true
 
-	for _, w := range g.Adj(s) {
+	for _, ww := range g.Adj(s) {
+		w := ww.(int)
 		if !d.marked[w] {
 			d.dfs(g, w)
 		}
@@ -44,4 +45,4 @@ func (d DepthFirstSearch) Marked(v int) bool {
 // Returns the number of vertices connected to the source vertex (s)
 func (d DepthFirstSearch) Count() int {
 	return d.count
-}
+}

graphs/graph/example_test.go

@@ -3,14 +3,14 @@ package graph_test
 import (
 	"fmt"
 
+	"github.com/youngzhu/algs4-go/fund"
 	"github.com/youngzhu/algs4-go/graphs/graph"
 	"github.com/youngzhu/algs4-go/util"
-	"github.com/youngzhu/algs4-go/fund"
 )
 
 var (
 	tinyGraph *graph.Graph
-	tinyCG *graph.Graph
+	tinyCG    *graph.Graph
 )
 
 func dataInit() {
@@ -95,7 +95,7 @@ func ExampleDepthFirstSearch() {
 	// NOT connected
 	// 9 10 11 12
 	// NOT connected
-	
+
 }
 
 func dfs(g graph.Graph, s int) {
@@ -117,7 +117,7 @@ func dfs(g graph.Graph, s int) {
 }
 
 func ExampleDepthFirstPaths() {
-	
+
 	if tinyCG == nil {
 		dataInit()
 	}
@@ -142,14 +142,14 @@ func ExampleDepthFirstPaths() {
 		}
 	}
 
-	// Output: 
+	// Output:
 	// 0 to 0: 0
 	// 0 to 1: 0-2-1
 	// 0 to 2: 0-2
 	// 0 to 3: 0-2-3
 	// 0 to 4: 0-2-3-4
 	// 0 to 5: 0-2-3-5
-	
+
 }
 
 func ExampleBreadthFirstPaths() {
@@ -177,14 +177,14 @@ func ExampleBreadthFirstPaths() {
 		}
 	}
 
-	// Output: 
+	// Output:
 	// 0 to 0 (0): 0
 	// 0 to 1 (1): 0-1
 	// 0 to 2 (1): 0-2
 	// 0 to 3 (2): 0-2-3
 	// 0 to 4 (2): 0-2-4
 	// 0 to 5 (1): 0-5
-	
+
 }
 
 func ExampleConnectedComponents() {
@@ -216,7 +216,7 @@ func ExampleConnectedComponents() {
 		fmt.Printf("\n")
 	}
 
-	// Output: 
+	// Output:
 	// 3 components
 	//  0 1 2 3 4 5 6
 	//  7 8
@@ -232,11 +232,11 @@ func ExampleSymbolGraph_routes() {
 
 	// Output:
 	// JFK
-    //     ORD
-    //     ATL
-    //     MCO
+	//     ORD
+	//     ATL
+	//     MCO
 	// KFC
-    //     input not contain 'KFC'
+	//     input not contain 'KFC'
 }
 
 func ExampleSymbolGraph_movies() {
@@ -254,9 +254,9 @@ func symbolGraph(sg graph.SymbolGraph, input string) {
 		s := sg.Index(input)
 		g := sg.Graph()
 		for _, v := range g.Adj(s) {
-			fmt.Printf("    %v\n", sg.Name(v))
+			fmt.Printf("    %v\n", sg.Name(v.(int)))
 		}
 	} else {
 		fmt.Printf("    input not contain '%v'\n", input)
 	}
-}
+}