remove _pace method, add interval interface instead

64json · 64json · commit 290183f56879 · 2016-05-24T02:44:34.000-05:00
diff --git a/algorithm/etc/dp/fibonacci/code.js b/algorithm/etc/dp/fibonacci/code.js
@@ -1,4 +1,3 @@
-tracer._pace(300);
 for (var i = 2; i < index; i++) {
     D[i] = D[i - 2] + D[i - 1];
     tracer._selectSet([i - 2, i - 1]);
diff --git a/algorithm/etc/dp/max_sum_path/code.js b/algorithm/etc/dp/max_sum_path/code.js
@@ -3,7 +3,6 @@ for (var i = 0; i < D.length; i++) {
     tracer._print('&nbsp;&nbsp;&nbsp;&nbsp;[' + D[i].join(', ') + ']');
 }
 tracer._print(']');
-tracer._pace(200);
 var N = DP.length;
 var M = DP[0].length;
 for (var i = 0; i < N; i++) {
diff --git a/algorithm/etc/dp/sliding_window/code.js b/algorithm/etc/dp/sliding_window/code.js
@@ -1,4 +1,3 @@
-tracer._pace(500);
 var sum = D[0] + D[1] + D[2];
 var max = sum;
 tracer._print('sum = ' + sum, false);
diff --git a/algorithm/graph_search/bellman_ford/shortest_path/code.js b/algorithm/graph_search/bellman_ford/shortest_path/code.js
@@ -68,7 +68,6 @@ do {
 }
 while (src === dest);
 
-tracer._pace(100);
 tracer._print('finding the shortest path from ' + src + ' to ' + dest);
 tracer._sleep(1000);
 
diff --git a/algorithm/graph_search/bfs/shortest_path/code.js b/algorithm/graph_search/bfs/shortest_path/code.js
@@ -28,7 +28,6 @@ do {
     e = Math.random() * G.length | 0;
 } while (s == e);
 var MAX_VALUE = Infinity;
-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
@@ -27,7 +27,6 @@ do {
 } while (s == e);
 var MAX_VALUE = Infinity;
 var minWeight = MAX_VALUE;
-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/algorithm/graph_search/dfs/weighted_graph/code.js b/algorithm/graph_search/dfs/weighted_graph/code.js
@@ -12,7 +12,6 @@ function DFS(node, parent, weight) { // node = current node, parent = previous n
     tracer._leave(node, parent, 0);
 }
 var D; // D[i] indicates whether the i-th node is discovered or not
-tracer._pace(1000);
 for (var i = 0; i < G.length; i++) { // start from every node
     tracer._print('start from ' + i);
     D = [];
diff --git a/algorithm/graph_search/dijkstra/shortest_path/code.js b/algorithm/graph_search/dijkstra/shortest_path/code.js
@@ -45,6 +45,5 @@ var e; // e = end node
 do {
     e = Math.random() * G.length | 0;
 } while (s == e);
-tracer._pace(500);
 tracer._print('finding the shortest path from ' + s + ' to ' + e);
 Dijkstra(s, e);
diff --git a/algorithm/graph_search/floyd_warshall/shortest_paths/code.js b/algorithm/graph_search/floyd_warshall/shortest_paths/code.js
@@ -30,6 +30,5 @@ function FloydWarshall() {
                 ' to ' + j + ' is ' + S[i][j]);
 }
 var MAX_VALUE = Infinity;
-tracer._pace(200);
 tracer._print('finding the shortest paths from and to all nodes');
 FloydWarshall();
diff --git a/algorithm/search/binary_search/iterative/code.js b/algorithm/search/binary_search/iterative/code.js
@@ -39,6 +39,5 @@ function BinarySearch(array, element) { // array = sorted array, element = eleme
 var element = D[Math.random() * D.length | 0];
 
 tracer._sleep(1000);
-tracer._pace(1000);
 tracer._print('Using iterative binary search to find ' + element);
 BinarySearch(D, element, 0, D.length - 1);
diff --git a/algorithm/search/binary_search/recursive/code.js b/algorithm/search/binary_search/recursive/code.js
@@ -35,6 +35,5 @@ function BinarySearch(array, element, minIndex, maxIndex) { // array = sorted ar
 var element = D[Math.random() * D.length | 0];
 
 tracer._sleep(1000);
-tracer._pace(1000);
 tracer._print('Using binary search to find ' + element);
 BinarySearch(D, element, 0, D.length - 1);
diff --git a/algorithm/sorting/bubble/basic/code.js b/algorithm/sorting/bubble/basic/code.js
@@ -1,6 +1,5 @@
 tracer._print('original array = [' + D.join(', ') + ']');
 tracer._sleep(1000);
-tracer._pace(300);
 var N = D.length;
 var swapped;
 do {
diff --git a/algorithm/sorting/heap/basic/code.js b/algorithm/sorting/heap/basic/code.js
@@ -51,7 +51,6 @@ function heapify(array, size, root) {
 }
 
 tracer._sleep(1000);
-tracer._pace(800);
 
 heapSort(D, 10);
 
diff --git a/algorithm/sorting/insertion/basic/code.js b/algorithm/sorting/insertion/basic/code.js
@@ -1,6 +1,5 @@
 tracer._print('original array = [' + D.join(', ') + ']');
 tracer._sleep(1000);
-tracer._pace(300);
 for (var i = 1; i < D.length; i++) {
     var key = D[i];
     tracer._print('insert ' + key);
diff --git a/algorithm/sorting/merge/basic/code.js b/algorithm/sorting/merge/basic/code.js
@@ -1,6 +1,5 @@
 tracer._print('original array = [' + D.join(', ') + ']');
 tracer._sleep(1000);
-tracer._pace(500);
 
 function mergeSort(start, end) {
     if (Math.abs(end - start) <= 1) return [];
diff --git a/algorithm/sorting/quick/basic/code.js b/algorithm/sorting/quick/basic/code.js
@@ -1,6 +1,5 @@
 tracer._print('original array = [' + D.join(', ') + ']');
 tracer._sleep(1000);
-tracer._pace(500);
 
 function quicksort(low, high) {
     if (low < high) {
diff --git a/algorithm/sorting/selection/basic/code.js b/algorithm/sorting/selection/basic/code.js
@@ -1,6 +1,5 @@
 tracer._print('original array = [' + D.join(', ') + ']');
 tracer._sleep(1000);
-tracer._pace(500);
 for (var i = 0; i < D.length - 1; i++) {
     var minJ = i;
     tracer._select(i);
diff --git a/css/stylesheet.css b/css/stylesheet.css
@@ -15,13 +15,16 @@ a {
 }
 
 * {
+    color: inherit;
+}
+
+*:not(input) {
     -webkit-touch-callout: none;
     -webkit-user-select: none;
     -moz-user-select: none;
     -ms-user-select: none;
     -o-user-select: none;
     user-select: none;
-    color: inherit;
 }
 
 button {
@@ -85,6 +88,14 @@ nav h3 {
     height: 100%;
 }
 
+button input {
+    outline: none;
+    background: none;
+    border: none;
+    width: 20px;
+    text-align: right;
+}
+
 .sidemenu {
     top: 30px;
     bottom: 0;
@@ -252,6 +263,11 @@ pre {
     background: rgba(120, 0, 0, .8);
 }
 
+.toast.info {
+    border-color: rgb(0, 150, 0);
+    background: rgba(0, 120, 0, .8);
+}
+
 .github-fork-ribbon {
     position: fixed;
 }
diff --git a/index.html b/index.html
@@ -25,6 +25,7 @@ <h3>
         <button id="btn_prev"><i class="fa fa-chevron-left" aria-hidden="true"></i> Prev</button>
         <button id="btn_pause"><i class="fa fa-pause" aria-hidden="true"></i> Pause</button>
         <button id="btn_next">Next <i class="fa fa-chevron-right" aria-hidden="true"></i></button>
+        <button id="btn_interval">Interval: <input type="text" value="0.5"> sec</button>
     </div>
 </nav>
 <section class="sidemenu active">
diff --git a/js/module/tracer.js b/js/module/tracer.js
@@ -4,7 +4,6 @@ var stepLimit = 1e6;
 var Tracer = function (module) {
     this.module = module || Tracer;
     this.traces = [];
-    this.traceOptions = null;
     this.traceIndex = -1;
     this.stepCnt = 0;
     this.capsule = tm.allocate(this);
@@ -49,18 +48,11 @@ Tracer.prototype = {
     _print: function (msg, delay) {
         this.pushStep({type: 'print', msg: msg}, delay);
     },
-    _pace: function (interval) {
-        this.pushStep({type: 'pace', interval: interval}, false);
-    },
     _clear: function () {
         this.pushStep({type: 'clear'}, true);
     },
-    visualize: function (options) {
-        options = options || {};
-        options.interval = options.interval || 500;
-
+    visualize: function () {
         $('#btn_trace').click();
-        this.traceOptions = options;
         this.traceIndex = -1;
         this.resumeStep();
     },
@@ -92,9 +84,6 @@ Tracer.prototype = {
                 case 'print':
                     tracer.printTrace(step.msg);
                     break;
-                case 'pace':
-                    tracer.traceOptions.interval = step.interval;
-                    break;
                 case 'clear':
                     tracer.clear();
                     tracer.printTrace('clear traces');
@@ -105,12 +94,12 @@ Tracer.prototype = {
         });
         if (!options.virtual) {
             this.refresh();
-            this.scrollToEnd(Math.min(50, this.traceOptions.interval));
+            this.scrollToEnd(Math.min(50, tm.interval));
         }
         if (tm.pause) return;
         timer = setTimeout(function () {
             tracer.step(i + 1, options);
-        }, sleepDuration || this.traceOptions.interval);
+        }, sleepDuration || tm.interval);
     },
     refresh: function () {
     },
diff --git a/js/module/tracer_manager.js b/js/module/tracer_manager.js
@@ -1,6 +1,7 @@
 var TracerManager = function () {
     this.pause = false;
     this.capsules = [];
+    this.interval = 500;
 };
 
 TracerManager.prototype = {
@@ -28,7 +29,6 @@ TracerManager.prototype = {
                 return false;
             }
         });
-        console.log('allocated ' + selectedCapsule);
         if (selectedCapsule == null) {
             selectedCapsule = this.add(newTracer);
         }
@@ -78,5 +78,8 @@ TracerManager.prototype = {
     },
     isPause: function () {
         return this.pause;
+    },
+    setInterval: function (interval) {
+        $('#btn_interval input').val(interval);
     }
 };
diff --git a/js/script.js b/js/script.js
@@ -10,6 +10,11 @@ $(document).on('click', 'a', function (e) {
 
 var tm = new TracerManager();
 
+$('#btn_interval input').on('change', function () {
+    tm.interval = Number.parseFloat($(this).val() * 1000);
+    showInfoToast('Tracing interval has been set to ' + tm.interval / 1000 + ' second(s).');
+});
+
 var $module_container = $('.module_container');
 var initEditor = function (id) {
     var editor = ace.edit(id);
@@ -193,6 +198,16 @@ var showErrorToast = function (err) {
     }, 3000);
 };
 
+var showInfoToast = function (info) {
+    var $toast = $('<div class="toast info">').append(info);
+    $('.toast_container').append($toast);
+    setTimeout(function () {
+        $toast.fadeOut(function () {
+            $toast.remove();
+        });
+    }, 3000);
+};
+
 $('#btn_run').click(function () {
     try {
         tm.deallocateAll();

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-tracer._pace(300);`
`2`	`1`	`for (var i = 2; i < index; i++) {`
`3`	`2`	`D[i] = D[i - 2] + D[i - 1];`
`4`	`3`	`tracer._selectSet([i - 2, i - 1]);`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ for (var i = 0; i < D.length; i++) {`
`3`	`3`	`tracer._print('    [' + D[i].join(', ') + ']');`
`4`	`4`	`}`
`5`	`5`	`tracer._print(']');`
`6`		`-tracer._pace(200);`
`7`	`6`	`var N = DP.length;`
`8`	`7`	`var M = DP[0].length;`
`9`	`8`	`for (var i = 0; i < N; i++) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-tracer._pace(500);`
`2`	`1`	`var sum = D[0] + D[1] + D[2];`
`3`	`2`	`var max = sum;`
`4`	`3`	`tracer._print('sum = ' + sum, false);`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ do {`
`68`	`68`	`}`
`69`	`69`	`while (src === dest);`
`70`	`70`
`71`		`-tracer._pace(100);`
`72`	`71`	`tracer._print('finding the shortest path from ' + src + ' to ' + dest);`
`73`	`72`	`tracer._sleep(1000);`
`74`	`73`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ function DFS(node, parent, weight) { // node = current node, parent = previous n`
`12`	`12`	`tracer._leave(node, parent, 0);`
`13`	`13`	`}`
`14`	`14`	`var D; // D[i] indicates whether the i-th node is discovered or not`
`15`		`-tracer._pace(1000);`
`16`	`15`	`for (var i = 0; i < G.length; i++) { // start from every node`
`17`	`16`	`tracer._print('start from ' + i);`
`18`	`17`	`D = [];`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,5 @@ function FloydWarshall() {`
`30`	`30`	`' to ' + j + ' is ' + S[i][j]);`
`31`	`31`	`}`
`32`	`32`	`var MAX_VALUE = Infinity;`
`33`		`-tracer._pace(200);`
`34`	`33`	`tracer._print('finding the shortest paths from and to all nodes');`
`35`	`34`	`FloydWarshall();`