add Integer.random function

64json · 64json · commit 98d73667936f · 2016-06-10T01:25:45.000+09:00
diff --git a/algorithm/cryptography/affine_cipher/basic/data.js b/algorithm/cryptography/affine_cipher/basic/data.js
@@ -1,18 +1,18 @@
-function randString (length) {
-	var choices = 'abcdefghijklmnopqrstuvwxyz';
-	var text = '';
+function randString(length) {
+  var choices = 'abcdefghijklmnopqrstuvwxyz';
+  var text = '';
 
-	for (var i = 0; i < length; i++) {
-		text += choices [Math.floor (Math.random () * choices.length)];
-	}
+  for (var i = 0; i < length; i++) {
+    text += choices[Integer.random(0, choices.length - 1)];
+  }
 
-	return text;
+  return text;
 }
 
 //var plainText = randString (5);
 var plainText = 'secret';
-var ptTracer = new Array1DTracer ('Encryption');
-var ctTracer = new Array1DTracer ('Decryption');
-var logger = new LogTracer ();
+var ptTracer = new Array1DTracer('Encryption');
+var ctTracer = new Array1DTracer('Decryption');
+var logger = new LogTracer();
 
-ptTracer._setData (plainText);
+ptTracer._setData(plainText);
diff --git a/algorithm/dp/integer_partition/basic/data.js b/algorithm/dp/integer_partition/basic/data.js
@@ -1,10 +1,10 @@
 var tracer = new Array2DTracer().attach(new LogTracer());
-var integer = Math.floor(Math.random() * 10) + 5;
+var integer = Integer.random(5, 14);
 var D = [], A = [];
-for (var i = 0; i <= integer; i++){
+for (var i = 0; i <= integer; i++) {
   D.push([]);
   D[0][i] = 1;
   D[i][1] = 1;
-  for (var j = 0; j <= integer; j++) D[i][j]=0;
+  for (var j = 0; j <= integer; j++) D[i][j] = 0;
 }
 tracer._setData(D);
diff --git a/algorithm/graph_search/bellman_ford/shortest_path/code.js b/algorithm/graph_search/bellman_ford/shortest_path/code.js
@@ -52,7 +52,7 @@ function BELLMAN_FORD(src, dest) {
   return weights[dest];
 }
 
-var src = Math.random() * G.length | 0, dest;
+var src = Integer.random(0, G.length - 1), dest;
 var MAX_VALUE = Infinity;
 var minWeight;
 
@@ -62,7 +62,7 @@ var minWeight;
  */
 
 do {
-  dest = Math.random() * G.length | 0;
+  dest = Integer.random(0, G.length - 1);
 }
 while (src === dest);
 
diff --git a/algorithm/graph_search/bfs/shortest_path/code.js b/algorithm/graph_search/bfs/shortest_path/code.js
@@ -23,10 +23,10 @@ function BFS() {
     }
     return W[e];
 }
-var s = Math.random() * G.length | 0; // s = start node
+var s = Integer.random(0, G.length - 1); // s = start node
 var e; // e = start node
 do {
-    e = Math.random() * G.length | 0;
+    e = Integer.random(0, G.length - 1);
 } while (s == e);
 var MAX_VALUE = Infinity;
 logger._print('finding the shortest path from ' + s + ' to ' + e);
diff --git a/algorithm/graph_search/dfs/shortest_path/code.js b/algorithm/graph_search/dfs/shortest_path/code.js
@@ -20,10 +20,10 @@ function DFS(node, parent, weight) { // node = current node, parent = previous n
     D[node] = false; // label current node as undiscovered
     tracer._leave(node, parent, 0)._wait();
 }
-var s = Math.random() * G.length | 0; // s = start node
+var s = Integer.random(0, G.length - 1); // s = start node
 var e; // e = end node
 do {
-    e = Math.random() * G.length | 0;
+    e = Integer.random(0, G.length - 1);
 } while (s == e);
 var MAX_VALUE = Infinity;
 var minWeight = MAX_VALUE;
diff --git a/algorithm/graph_search/dijkstra/shortest_path/code.js b/algorithm/graph_search/dijkstra/shortest_path/code.js
@@ -39,10 +39,10 @@ function Dijkstra(start, end) {
     }
 }
 
-var s = Math.random() * G.length | 0; // s = start node
+var s = Integer.random(0, G.length - 1); // s = start node
 var e; // e = end node
 do {
-    e = Math.random() * G.length | 0;
+    e = Integer.random(0, G.length - 1);
 } while (s == e);
 logger._print('finding the shortest path from ' + s + ' to ' + e)._wait();
 Dijkstra(s, e);
diff --git a/algorithm/search/binary_search/iterative/code.js b/algorithm/search/binary_search/iterative/code.js
@@ -37,7 +37,7 @@ function BinarySearch(array, element) { // array = sorted array, element = eleme
     return -1;
 }
 
-var element = D[Math.random() * D.length | 0];
+var element = D[Integer.random(0, D.length - 1)];
 
 logger._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
@@ -33,7 +33,7 @@ function BinarySearch(array, element, minIndex, maxIndex) { // array = sorted ar
     return -1;
 }
 
-var element = D[Math.random() * D.length | 0];
+var element = D[Integer.random(0, D.length - 1)];
 
 logger._print('Using binary search to find ' + element);
 BinarySearch(D, element, 0, D.length - 1);
diff --git a/algorithm/string/knuth_morris_pratt/substring_search/data.js b/algorithm/string/knuth_morris_pratt/substring_search/data.js
@@ -1,19 +1,19 @@
-function randString (length) {
-	var result = Math.random ().toString (36);
-	return result.substring (result.length - length);
+function randString(length) {
+  var result = Math.random().toString(36);
+  return result.substring(result.length - length);
 }
 
-var string = randString (15), substring = randString (5);
+var string = randString(15), substring = randString(5);
 //var string = 'abcxabcdabxabcdabcdabxabcda', substring = 'xabcda';
 //var string = 'abcxabcdabxabcdabcdabcyiuhsiuhduiahdubhbuuabcdabcysbhbh', substring = 'abcdabcy';
 
-var track = Array.apply (null, Array (substring.length)).map (Number.prototype.valueOf, 0);
+var track = Array.apply(null, Array(substring.length)).map(Number.prototype.valueOf, 0);
 
-var trackTracer = new Array1DTracer ('Tracker'),
-	substrTracer = new Array1DTracer ('Substring'),
-	stringTracer = new Array1DTracer ('Major String');
-var logger = new LogTracer ();
+var trackTracer = new Array1DTracer('Tracker'),
+  substrTracer = new Array1DTracer('Substring'),
+  stringTracer = new Array1DTracer('Major String');
+var logger = new LogTracer();
 
-trackTracer._setData (track);
-substrTracer._setData (substring);
-stringTracer._setData (string);
+trackTracer._setData(track);
+substrTracer._setData(substring);
+stringTracer._setData(string);
diff --git a/algorithm/tree/binary_search_tree/bst_search/data.js b/algorithm/tree/binary_search_tree/bst_search/data.js
@@ -27,7 +27,7 @@ var T = [ // mapping to G as a binary tree , [i][0] indicates left child, [i][1]
   [9, -1]
 ];
 
-var key = Math.random() * G.length | 0; // item to be searched
+var key = Integer.random(0, G.length - 1); // item to be searched
 var tracer = new DirectedGraphTracer(" Binary Search Tree ")._setTreeData(G, 5);
 var logger = new LogTracer(" Log ");
 tracer.attach(logger);
diff --git a/js/module/data/array2d.js b/js/module/data/array2d.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const Integer = require('./integer');
+
 const random = (N, M, min, max) => {
   if (!N) N = 10;
   if (!M) M = 10;
@@ -9,7 +11,7 @@ const random = (N, M, min, max) => {
   for (var i = 0; i < N; i++) {
     D.push([]);
     for (var j = 0; j < M; j++) {
-      D[i].push((Math.random() * (max - min + 1) | 0) + min);
+      D[i].push(Integer.random(min, max));
     }
   }
   return D;
diff --git a/js/module/data/coordinate_system.js b/js/module/data/coordinate_system.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const Integer = require('./integer');
+
 const random = (N, min, max) => {
   if (!N) N = 7;
   if (!min) min = 1;
@@ -8,7 +10,7 @@ const random = (N, min, max) => {
   for (var i = 0; i < N; i++) C[i] = new Array(2);
   for (var i = 0; i < N; i++)
     for (var j = 0; j < C[i].length; j++)
-      C[i][j] = (Math.random() * (max - min + 1) | 0) + min;
+      C[i][j] = Integer.random(min, max);
   return C;
 };
 
diff --git a/js/module/data/index.js b/js/module/data/index.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const Integer = require('./integer');
 const Array1D = require('./array1d');
 const Array2D = require('./array2d');
 const CoordinateSystem = require('./coordinate_system');
@@ -9,6 +10,7 @@ const WeightedDirectedGraph = require('./weighted_directed_graph');
 const WeightedUndirectedGraph = require('./weighted_undirected_graph');
 
 module.exports = {
+  Integer,
   Array1D,
   Array2D,
   CoordinateSystem,
diff --git a/js/module/data/integer.js b/js/module/data/integer.js
@@ -0,0 +1,9 @@
+'use strict';
+
+const random = (min, max) => {
+  return (Math.random() * (max - min + 1) | 0) + min;
+};
+
+module.exports = {
+  random
+};
diff --git a/js/module/data/weighted_directed_graph.js b/js/module/data/weighted_directed_graph.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const Integer = require('./integer');
+
 const random = (N, ratio, min, max) => {
   if (!N) N = 5;
   if (!ratio) ratio = .3;
@@ -10,7 +12,7 @@ const random = (N, ratio, min, max) => {
     G[i] = new Array(N);
     for (var j = 0; j < N; j++) {
       if (i != j && (Math.random() * (1 / ratio) | 0) == 0) {
-        G[i][j] = (Math.random() * (max - min + 1) | 0) + min;
+        G[i][j] = Integer.random(min, max);
       }
     }
   }
diff --git a/js/module/data/weighted_undirected_graph.js b/js/module/data/weighted_undirected_graph.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const Integer = require('./integer');
+
 const random = (N, ratio, min, max) => {
   if (!N) N = 5;
   if (!ratio) ratio = .3;
@@ -10,7 +12,7 @@ const random = (N, ratio, min, max) => {
   for (var i = 0; i < N; i++) {
     for (var j = 0; j < N; j++) {
       if (i > j && (Math.random() * (1 / ratio) | 0) == 0) {
-        G[i][j] = G[j][i] = (Math.random() * (max - min + 1) | 0) + min;
+        G[i][j] = G[j][i] = Integer.random(min, max);
       }
     }
   }
diff --git a/public/algorithm_visualizer.js b/public/algorithm_visualizer.js
diff --git a/public/algorithm_visualizer.js.map b/public/algorithm_visualizer.js.map
diff --git a/public/algorithm_visualizer.min.js b/public/algorithm_visualizer.min.js
diff --git a/public/algorithm_visualizer.min.js.map b/public/algorithm_visualizer.min.js.map

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ function BELLMAN_FORD(src, dest) {`
`52`	`52`	`return weights[dest];`
`53`	`53`	`}`
`54`	`54`
`55`		`-var src = Math.random() * G.length \| 0, dest;`
	`55`	`+var src = Integer.random(0, G.length - 1), dest;`
`56`	`56`	`var MAX_VALUE = Infinity;`
`57`	`57`	`var minWeight;`
`58`	`58`
`@@ -62,7 +62,7 @@ var minWeight;`
`62`	`62`	`*/`
`63`	`63`
`64`	`64`	`do {`
`65`		`- dest = Math.random() * G.length \| 0;`
	`65`	`+ dest = Integer.random(0, G.length - 1);`
`66`	`66`	`}`
`67`	`67`	`while (src === dest);`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,10 @@ function BFS() {`
`23`	`23`	`}`
`24`	`24`	`return W[e];`
`25`	`25`	`}`
`26`		`-var s = Math.random() * G.length \| 0; // s = start node`
	`26`	`+var s = Integer.random(0, G.length - 1); // s = start node`
`27`	`27`	`var e; // e = start node`
`28`	`28`	`do {`
`29`		`- e = Math.random() * G.length \| 0;`
	`29`	`+ e = Integer.random(0, G.length - 1);`
`30`	`30`	`} while (s == e);`
`31`	`31`	`var MAX_VALUE = Infinity;`
`32`	`32`	`logger._print('finding the shortest path from ' + s + ' to ' + e);`
Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,10 @@ function Dijkstra(start, end) {`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`		`-var s = Math.random() * G.length \| 0; // s = start node`
	`42`	`+var s = Integer.random(0, G.length - 1); // s = start node`
`43`	`43`	`var e; // e = end node`
`44`	`44`	`do {`
`45`		`- e = Math.random() * G.length \| 0;`
	`45`	`+ e = Integer.random(0, G.length - 1);`
`46`	`46`	`} while (s == e);`
`47`	`47`	`logger._print('finding the shortest path from ' + s + ' to ' + e)._wait();`
`48`	`48`	`Dijkstra(s, e);`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ function BinarySearch(array, element) { // array = sorted array, element = eleme`
`37`	`37`	`return -1;`
`38`	`38`	`}`
`39`	`39`
`40`		`-var element = D[Math.random() * D.length \| 0];`
	`40`	`+var element = D[Integer.random(0, D.length - 1)];`
`41`	`41`
`42`	`42`	`logger._print('Using iterative binary search to find ' + element);`
`43`	`43`	`BinarySearch(D, element, 0, D.length - 1);`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ function BinarySearch(array, element, minIndex, maxIndex) { // array = sorted ar`
`33`	`33`	`return -1;`
`34`	`34`	`}`
`35`	`35`
`36`		`-var element = D[Math.random() * D.length \| 0];`
	`36`	`+var element = D[Integer.random(0, D.length - 1)];`
`37`	`37`
`38`	`38`	`logger._print('Using binary search to find ' + element);`
`39`	`39`	`BinarySearch(D, element, 0, D.length - 1);`