fix kruskal

Author: 64json

algorithm/mst/kruskal/normal/code.js

@@ -1,50 +1,51 @@
-function kruskal () {
-  var vcount = G.length;
-
-  // Preprocess: sort edges by weight.
-  var edges = [];
-  for (var vi = 0; vi < vcount - 1; vi++) {
-    for (var vj = vi + 1; vj < vcount; vj++) {
-      edges.push({
-        0: vi,
-        1: vj,
-        weight: G[vi][vj]
-      });
+function kruskal() {
+    var vcount = G.length;
+
+    // Preprocess: sort edges by weight.
+    var edges = [];
+    for (var vi = 0; vi < vcount - 1; vi++) {
+        for (var vj = vi + 1; vj < vcount; vj++) {
+            edges.push({
+                0: vi,
+                1: vj,
+                weight: G[vi][vj]
+            });
+        }
     }
-  }
-  edges.sort(function (ei, ej) { return ei.weight - ej.weight });
-
-  // Give each vertex a tree to decide if they are already in the same tree.
-  var t = [];
-  for (var i = 0; i < vcount; i++) {
-    t[i] = {};
-    t[i][i] = true;
-  }
-
-  var wsum = 0;
-  for (var n = 0; n < vcount - 1 && edges.length > 0;) {
-    var e = edges.shift(); // Get the edge of min weight
-    tracer._visit(e[0], e[1]);
-    if (t[e[0]] === t[e[1]]) {
-      // e[0] & e[1] already in the same tree, ignore
-      tracer._leave(e[0], e[1]);
-      continue;
+    edges.sort(function (ei, ej) {
+        return ei.weight - ej.weight
+    });
+
+    // Give each vertex a tree to decide if they are already in the same tree.
+    var t = [];
+    for (var i = 0; i < vcount; i++) {
+        t[i] = {};
+        t[i][i] = true;
     }
 
-    // Choose the current edge.
-    wsum += e.weight;
-
-    // Merge tree of e[0] & e[1]
-    var tmerged = {};
-    for (i in t[e[0]]) tmerged[i] = true;
-    for (i in t[e[1]]) tmerged[i] = true;
-    for (i in tmerged) t[i] = tmerged;
-
-    n += 1;
-  }
+    var wsum = 0;
+    for (var n = 0; n < vcount - 1 && edges.length > 0;) {
+        var e = edges.shift(); // Get the edge of min weight
+        tracer._visit(e[0], e[1])._wait();
+        if (t[e[0]] === t[e[1]]) {
+            // e[0] & e[1] already in the same tree, ignore
+            tracer._leave(e[0], e[1])._wait();
+            continue;
+        }
+
+        // Choose the current edge.
+        wsum += e.weight;
+
+        // Merge tree of e[0] & e[1]
+        var tmerged = {};
+        for (i in t[e[0]]) tmerged[i] = true;
+        for (i in t[e[1]]) tmerged[i] = true;
+        for (i in tmerged) t[i] = tmerged;
+
+        n += 1;
+    }
 
-  tracer._print("The sum of all edges is: " + wsum);
+    logger._print("The sum of all edges is: " + wsum);
 }
 
-tracer._pace(500);
 kruskal();

algorithm/mst/kruskal/normal/data.js

@@ -1,4 +1,5 @@
 var tracer = new WeightedUndirectedGraphTracer();
+var logger = new LogTracer();
 /*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],
@@ -7,4 +8,4 @@ var tracer = new WeightedUndirectedGraphTracer();
  [0, 1, 3, 0, 0]
  ];*/
 var G = WeightedUndirectedGraph.random(5, 1, 1, 9);
-tracer._setData(G);
+tracer._setData(G);