prepare for other modules

64json · 64json · commit fa6f85435ec6 · 2016-05-19T02:08:42.000-05:00
diff --git a/algorithm/category.json b/algorithm/category.json
@@ -5,5 +5,14 @@
       "dfs": "DFS",
       "bfs": "BFS"
     }
+  },
+  "sorting": {
+    "name": "Sorting",
+    "list": {
+      "insertion": "Insertion Sort",
+      "selection": "Selection Sort",
+      "bubble": "Bubble Sort",
+      "quick": "Quick Sort"
+    }
   }
 }
diff --git a/algorithm/graph_search/bfs/shortest_path/code.js b/algorithm/graph_search/bfs/shortest_path/code.js
@@ -29,7 +29,7 @@ do {
     e = Math.random() * G.length | 0;
 } while (s == e);
 var MAX_VALUE = 999;
-tracer._pace(500);
+tracer._pace(100);
 tracer._print('finding the shortest path from ' + s + ' to ' + e);
 tracer._sleep(1000);
 var minWeight = BFS(s);
diff --git a/algorithm/graph_search/dfs/shortest_path/code.js b/algorithm/graph_search/dfs/shortest_path/code.js
@@ -28,7 +28,7 @@ do {
 } while (s == e);
 var MAX_VALUE = 999;
 var minWeight = MAX_VALUE;
-tracer._pace(500);
+tracer._pace(100);
 tracer._print('finding the shortest path from ' + s + ' to ' + e);
 tracer._sleep(1000);
 var D = []; // D[i] indicates whether the i-th node is discovered or not
diff --git a/js/module/graph.js b/js/module/graph.js
@@ -1,11 +1,13 @@
-var s = null, graph = null, graphMode = null, sigmaCanvas = null;
+var s = null, graph = null, sigmaCanvas = null;
 
 function GraphTracer(module) {
-    Tracer.call(this, module || GraphTracer);
-    return initGraph(this.module);
+    if (Tracer.call(this, module || WeightedGraphTracer)) {
+        initGraph();
+        return true;
+    }
+    return false;
 }
 
-GraphTracer.graphMode = "default";
 GraphTracer.prototype = Object.create(Tracer.prototype);
 GraphTracer.prototype.constructor = GraphTracer;
 
@@ -59,7 +61,6 @@ GraphTracer.prototype.setTreeData = function (G, root) {
     if (this.setData(G, root)) return true;
 
     var place = function (node, x, y) {
-        console.log(node);
         var temp = graph.nodes(n(node));
         temp.x = x;
         temp.y = y;
@@ -190,10 +191,7 @@ GraphTracer.prototype.prevStep = function () {
     this.step(finalIndex);
 };
 
-var initGraph = function (module) {
-    if (s && graph && graphMode == module.graphMode) return false;
-    graphMode = module.graphMode;
-
+var initGraph = function () {
     $('.visualize_container').empty();
     if (sigmaCanvas == null) {
         sigmaCanvas = $.extend(true, {}, sigma.canvas);
@@ -232,8 +230,6 @@ var initGraph = function (module) {
         drawArrow(edge, source, target, color, context, settings);
     };
     sigma.plugins.dragNodes(s, s.renderers[0]);
-
-    return true;
 };
 
 var graphColor = {
diff --git a/js/module/weighted_graph.js b/js/module/weighted_graph.js
@@ -6,7 +6,6 @@ function WeightedGraphTracer(module) {
     return false;
 }
 
-WeightedGraphTracer.graphMode = "weighted";
 WeightedGraphTracer.prototype = Object.create(GraphTracer.prototype);
 WeightedGraphTracer.prototype.constructor = WeightedGraphTracer;
 
diff --git a/js/script.js b/js/script.js
@@ -13,14 +13,14 @@ var codeEditor = initEditor('code');
 dataEditor.on('change', function () {
     try {
         eval(dataEditor.getValue());
+        lastModule = _tracer && _tracer.module;
         _tracer = tracer;
     } catch (err) {
     }
     _tracer.reset();
 });
 
 var loadFile = function (category, algorithm, file, explanation) {
-    lastModule = null;
     lastData = null;
     $('#explanation').html(explanation);
     dataEditor.setValue('');
@@ -134,6 +134,7 @@ $('#navigation').click(function () {
 $('#btn_run').click(function () {
     try {
         eval(dataEditor.getValue());
+        lastModule = _tracer && _tracer.module;
         _tracer = tracer;
         _tracer.reset();
         eval(codeEditor.getValue());
diff --git a/js/tracer.js b/js/tracer.js
@@ -9,6 +9,8 @@ var Tracer = function (module) {
     this.traceOptions = null;
     this.traceIndex = -1;
     this.stepCnt = 0;
+
+    return lastModule != module;
 };
 
 Tracer.prototype.resize = function () {
@@ -30,8 +32,7 @@ Tracer.prototype.createRandomData = function (arguments) {
 
 Tracer.prototype.setData = function (arguments) {
     var data = JSON.stringify(arguments);
-    if (lastModule == this.module && lastData == data) return true;
-    lastModule = this.module;
+    if (lastData == data) return true;
     lastData = data;
     return false;
 };

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,14 @@`
`5`	`5`	`"dfs": "DFS",`
`6`	`6`	`"bfs": "BFS"`
`7`	`7`	`}`
	`8`	`+ },`
	`9`	`+ "sorting": {`
	`10`	`+ "name": "Sorting",`
	`11`	`+ "list": {`
	`12`	`+ "insertion": "Insertion Sort",`
	`13`	`+ "selection": "Selection Sort",`
	`14`	`+ "bubble": "Bubble Sort",`
	`15`	`+ "quick": "Quick Sort"`
	`16`	`+ }`
`8`	`17`	`}`
`9`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ function WeightedGraphTracer(module) {`
`6`	`6`	`return false;`
`7`	`7`	`}`
`8`	`8`
`9`		`-WeightedGraphTracer.graphMode = "weighted";`
`10`	`9`	`WeightedGraphTracer.prototype = Object.create(GraphTracer.prototype);`
`11`	`10`	`WeightedGraphTracer.prototype.constructor = WeightedGraphTracer;`
`12`	`11`