simplify data of dfs examples

64json · 64json · commit 497c7e460da2 · 2016-06-03T14:19:45.000+09:00
diff --git a/algorithm/graph_search/dfs/all_paths/data.js b/algorithm/graph_search/dfs/all_paths/data.js
@@ -1,12 +1,5 @@
 var tracer = new DirectedGraphTracer();
 var logger = new LogTracer();
 tracer.attach(logger);
-/*var G = [ // G[i][j] indicates whether the path from the i-th node to the j-th node exists or not
- [0, 1, 1, 1, 0],
- [0, 0, 1, 1, 1],
- [0, 0, 0, 0, 0],
- [0, 0, 0, 0, 1],
- [0, 0, 0, 0, 0]
- ];*/
-var G = DirectedGraph.random(5, .75);
+var G = DirectedGraph.random(4, .75);
 tracer._setData(G);
diff --git a/algorithm/graph_search/dfs/exploration/code.js b/algorithm/graph_search/dfs/exploration/code.js
@@ -1,35 +1,36 @@
-function DFSExplore (graph, source) {
-	var stack = [ [source, null] ], visited = {};
-	var node, prev, i, temp;
+function DFSExplore(graph, source) {
+  var stack = [[source, null]], visited = {};
+  var node, prev, i, temp;
 
-	while (stack.length > 0) {
-		temp = stack.pop ();
-		node = temp [0];
-		prev = temp [1];
+  while (stack.length > 0) {
+    temp = stack.pop();
+    node = temp [0];
+    prev = temp [1];
 
-		if (!visited [node]) {
-			visited [node] = true;
-			logger._print (node);
+    if (!visited [node]) {
+      visited [node] = true;
 
-			if (prev !== undefined && graph [node] [prev]) { tracer._visit (node, prev)._wait (); console.log ('tracer ' + prev + ', ' + node); }
-			else { tracer._visit (node)._wait (); console.log ('tracer ' + node); }
+      if (prev !== undefined && graph [node] [prev]) {
+        tracer._visit(node, prev)._wait();
+      } else {
+        tracer._visit(node)._wait();
+      }
 
-			for (i = 0; i < graph.length; i++) {
-				if (graph [node] [i]) {
-					stack.push ([i, node]);
-				}
-			}
-		}
-	}
+      for (i = 0; i < graph.length; i++) {
+        if (graph [node] [i]) {
+          stack.push([i, node]);
+        }
+      }
+    }
+  }
 
-	return visited;
+  return visited;
 }
 
-
-var visited = DFSExplore (G, 0);
-if (G.length === Object.keys (visited).length) {
-	logger._print ('The Graph is CONNECTED');
+var visited = DFSExplore(G, 0);
+if (G.length === Object.keys(visited).length) {
+  logger._print('The Graph is CONNECTED');
 }
 else {
-	logger._print ('The Graph is NOT CONNECTED');
+  logger._print('The Graph is NOT CONNECTED');
 }
diff --git a/algorithm/graph_search/dfs/exploration/data.js b/algorithm/graph_search/dfs/exploration/data.js
@@ -1,5 +1,6 @@
 var tracer = new UndirectedGraphTracer();
 var logger = new LogTracer();
+tracer.attach(logger);
 var G = UndirectedGraph.random(8, .2);
 
 tracer._setData(G);
diff --git a/algorithm/graph_search/dfs/shortest_path/data.js b/algorithm/graph_search/dfs/shortest_path/data.js
@@ -1,12 +1,5 @@
 var tracer = new WeightedDirectedGraphTracer();
 var logger = new LogTracer();
 tracer.attach(logger);
-/*var G = [ // G[i][j] indicates the weight of the path from the i-th node to the j-th node
- [0, 3, 0, 1, 0],
- [5, 0, 1, 2, 4],
- [1, 0, 0, 2, 0],
- [0, 2, 0, 0, 1],
- [0, 1, 3, 0, 0]
- ];*/
 var G = WeightedDirectedGraph.random(10, .3, 1, 9);
 tracer._setData(G);
diff --git a/algorithm/graph_search/dfs/weighted_graph/code.js b/algorithm/graph_search/dfs/weighted_graph/code.js
@@ -1,5 +1,4 @@
 function DFS(node, parent, weight) { // node = current node, parent = previous node
-    logger._print((parent === undefined ? '' : parent) + ' -> ' + node);
     tracer._visit(node, parent, weight)._wait();
     D[node] = true; // label current node as discovered
     for (var i = 0; i < G[node].length; i++) {
@@ -10,7 +9,6 @@ function DFS(node, parent, weight) { // node = current node, parent = previous n
         }
     }
     D[node] = false; // label current node as undiscovered
-    logger._print(node + ' <- ' + (parent === undefined ? '' : parent));
     tracer._leave(node, parent, 0)._wait();
 }
 var D; // D[i] indicates whether the i-th node is discovered or not
diff --git a/algorithm/graph_search/dfs/weighted_graph/data.js b/algorithm/graph_search/dfs/weighted_graph/data.js
@@ -1,11 +1,5 @@
 var tracer = new WeightedDirectedGraphTracer();
-/*var G = [ // G[i][j] indicates the weight of the path from the i-th node to the j-th node
- [0, 3, 0, 1, 0],
- [5, 0, 1, 2, 4],
- [1, 0, 0, 2, 0],
- [0, 2, 0, 0, 1],
- [0, 1, 3, 0, 0]
- ];*/
-var G = WeightedDirectedGraph.random(5, .5);
-tracer._setData(G);
-var logger = new LogTracer();
+var logger = new LogTracer();
+tracer.attach(logger);
+var G = WeightedDirectedGraph.random(4, .5);
+tracer._setData(G);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`function DFS(node, parent, weight) { // node = current node, parent = previous node`
`2`		`- logger._print((parent === undefined ? '' : parent) + ' -> ' + node);`
`3`	`2`	`tracer._visit(node, parent, weight)._wait();`
`4`	`3`	`D[node] = true; // label current node as discovered`
`5`	`4`	`for (var i = 0; i < G[node].length; i++) {`
`@@ -10,7 +9,6 @@ function DFS(node, parent, weight) { // node = current node, parent = previous n`
`10`	`9`	`}`
`11`	`10`	`}`
`12`	`11`	`D[node] = false; // label current node as undiscovered`
`13`		`- logger._print(node + ' <- ' + (parent === undefined ? '' : parent));`
`14`	`12`	`tracer._leave(node, parent, 0)._wait();`
`15`	`13`	`}`
`16`	`14`	`var D; // D[i] indicates whether the i-th node is discovered or not`