Improve randomize

64json · 64json · commit 0a6c45206fae · 2018-07-12T16:13:49.000+09:00
diff --git a/Dynamic Programming/Integer Partition/code.js b/Dynamic Programming/Integer Partition/code.js
@@ -2,7 +2,7 @@ import { Array2DTracer, LogTracer, Randomize } from 'algorithm-visualizer';
 
 const tracer = new Array2DTracer();
 const logger = new LogTracer();
-const integer = Randomize.integer(5, 14);
+const integer = new Randomize.Integer(5, 14).create();
 const D = [];
 const A = [];
 for (let i = 0; i <= integer; i++) {
diff --git a/Dynamic Programming/Longest Increasing Subsequence/code.js b/Dynamic Programming/Longest Increasing Subsequence/code.js
@@ -2,7 +2,7 @@ import { Array1DTracer, LogTracer, Randomize } from 'algorithm-visualizer';
 
 const tracer = new Array1DTracer();
 const logger = new LogTracer();
-const A = Randomize.array1D(10, { min: 0, max: 10 });
+const A = new Randomize.Array1D(10, new Randomize.Integer(0, 10)).create();
 const LIS = new Array(A.length);
 tracer.set(A).delay();
 
diff --git a/Dynamic Programming/Maximum Sum Path/code.js b/Dynamic Programming/Maximum Sum Path/code.js
@@ -1,6 +1,6 @@
 import { Array2DTracer, LogTracer, Randomize } from 'algorithm-visualizer';
 
-const D = Randomize.array2D(5, 5, { min: 1, max: 5 });
+const D = new Randomize.Array2D(5, 5, new Randomize.Integer(1, 5)).create();
 const dataViewer = new Array2DTracer().set(D);
 const tracer = new Array2DTracer('Results Table');
 const logger = new LogTracer();
@@ -15,13 +15,15 @@ tracer.set(DP).delay();
 
 const N = DP.length;
 const M = DP[0].length;
+
 function update(i, j, value) {
   DP[i][j] = value;
   dataViewer.select(i, j).delay();
   tracer.patch(i, j, DP[i][j]).delay();
   tracer.depatch(i, j);
   dataViewer.deselect(i, j);
 }
+
 for (let i = 0; i < N; i++) {
   for (let j = 0; j < M; j++) {
     if (i === 0 && j === 0) {
diff --git a/Dynamic Programming/Sliding Window/code.js b/Dynamic Programming/Sliding Window/code.js
@@ -2,7 +2,7 @@ import { Array1DTracer, LogTracer, Randomize } from 'algorithm-visualizer';
 
 const tracer = new Array1DTracer();
 const logger = new LogTracer();
-const D = Randomize.array1D(20, { min: -5, max: 5 });
+const D = new Randomize.Array1D(20, new Randomize.Integer(-5, 5)).create();
 tracer.set(D).delay();
 
 let sum = D[0] + D[1] + D[2];
diff --git a/Graph Search/All Paths (DFS)/code.js b/Graph Search/All Paths (DFS)/code.js
@@ -3,7 +3,7 @@ import { GraphTracer, LogTracer, Randomize } from 'algorithm-visualizer';
 const tracer = new GraphTracer().directed(false);
 const logger = new LogTracer();
 tracer.log(logger);
-const G = Randomize.graph(5, { directed: false, ratio: 1 });
+const G = new Randomize.Graph(5, 1).directed(false).create();
 tracer.set(G).delay();
 
 let D; // D[i] indicates whether the i-th node is discovered or not
diff --git a/Graph Search/Bellman-Ford/code.js b/Graph Search/Bellman-Ford/code.js
@@ -3,9 +3,7 @@ import { GraphTracer, LogTracer, Randomize } from 'algorithm-visualizer';
 const tracer = new GraphTracer().weighted();
 const logger = new LogTracer();
 tracer.log(logger);
-const G = Randomize.graph(5, {
-  directed: true, weighted: true, ratio: 0.5, min: -2, max: 5,
-});
+const G = new Randomize.Graph(5, .5, new Randomize.Integer(-2, 5)).weighted().create();
 tracer.set(G).delay();
 
 function BELLMAN_FORD(src, dest) {
@@ -64,7 +62,7 @@ function BELLMAN_FORD(src, dest) {
   return weights[dest];
 }
 
-const src = Randomize.integer(0, G.length - 1);
+const src = new Randomize.Integer(0, G.length - 1).create();
 let dest;
 let MAX_VALUE = Infinity;
 let minWeight;
@@ -75,7 +73,7 @@ let minWeight;
  */
 
 do {
-  dest = Randomize.integer(0, G.length - 1);
+  dest = new Randomize.Integer(0, G.length - 1).create();
 }
 while (src === dest);
 
diff --git a/Graph Search/DFS Exploration/code.js b/Graph Search/DFS Exploration/code.js
@@ -4,7 +4,7 @@ const graphTracer = new GraphTracer().directed(false);
 const visitedTracer = new Array1DTracer('visited');
 const logger = new LogTracer();
 graphTracer.log(logger);
-const G = Randomize.graph(8, { directed: false, ratio: 0.3 });
+const G = new Randomize.Graph(8, .3).directed(false).create();
 graphTracer.set(G).delay();
 
 function DFSExplore(graph, source) {
diff --git a/Graph Search/DFS Weighted Graph/code.js b/Graph Search/DFS Weighted Graph/code.js
@@ -3,7 +3,7 @@ import { GraphTracer, LogTracer, Randomize } from 'algorithm-visualizer';
 const tracer = new GraphTracer().directed(false).weighted();
 const logger = new LogTracer();
 tracer.log(logger);
-const G = Randomize.graph(5, { directed: false, weighted: true, ratio: 1 });
+const G = new Randomize.Graph(5, 1).directed(false).weighted().create();
 tracer.set(G).delay();
 
 let D; // D[i] indicates whether the i-th node is discovered or not
diff --git a/Graph Search/Dijkstra/code.js b/Graph Search/Dijkstra/code.js
@@ -4,9 +4,7 @@ const tracer = new GraphTracer().directed(false).weighted();
 const tracerS = new Array1DTracer();
 const logger = new LogTracer();
 tracer.log(logger);
-const G = Randomize.graph(5, {
-  directed: false, weighted: true, ratio: 1, min: 1, max: 9,
-});
+const G = new Randomize.Graph(5, 1).directed(false).weighted().create();
 tracer.set(G);
 const MAX_VALUE = Infinity;
 const S = []; // S[end] returns the distance from start node to end node
@@ -55,10 +53,10 @@ function Dijkstra(start, end) {
   }
 }
 
-const s = Randomize.integer(0, G.length - 1); // s = start node
+const s = new Randomize.Integer(0, G.length - 1).create(); // s = start node
 let e; // e = end node
 do {
-  e = Randomize.integer(0, G.length - 1);
+  e = new Randomize.Integer(0, G.length - 1).create();
 } while (s === e);
 logger.print(`finding the shortest path from ${s} to ${e}`).delay();
 Dijkstra(s, e);
diff --git a/Graph Search/Floyd-Warshall/code.js b/Graph Search/Floyd-Warshall/code.js
@@ -3,9 +3,7 @@ import { GraphTracer, LogTracer, Randomize } from 'algorithm-visualizer';
 const tracer = new GraphTracer().weighted();
 const logger = new LogTracer();
 tracer.log(logger);
-const G = Randomize.graph(5, {
-  directed: true, weighted: true, ratio: 1, min: 1, max: 9,
-});
+const G = new Randomize.Graph(5, 1).weighted().create();
 tracer.set(G).delay();
 
 function FloydWarshall() {
@@ -48,6 +46,7 @@ function FloydWarshall() {
     }
   }
 }
+
 let MAX_VALUE = Infinity;
 logger.print('finding the shortest paths from and to all nodes');
 FloydWarshall();
diff --git a/Graph Search/PageRank Algorithm (V2)/code.js b/Graph Search/PageRank Algorithm (V2)/code.js
@@ -4,7 +4,7 @@ function filledArray(length, value) {
   return Array(...Array(length)).map(Number.prototype.valueOf, value);
 }
 
-const G = Randomize.graph(5, { ratio: 0.4 });
+const G = new Randomize.Graph(5, .4).create();
 let ranks;
 const outgoingEdgeCounts = filledArray(G.length, 0);
 let incomingNodes;
@@ -18,7 +18,7 @@ const logger = new LogTracer();
 graphTracer.set(G);
 oecTracer.set(outgoingEdgeCounts);
 
-for (incomingNodes = []; incomingNodes.length < G.length; incomingNodes.push(filledArray(G.length, -1)));
+for (incomingNodes = []; incomingNodes.length < G.length; incomingNodes.push(filledArray(G.length, -1))) ;
 inTracer.set(incomingNodes).delay();
 
 /*
diff --git a/Graph Search/PageRank Algorithm/code.js b/Graph Search/PageRank Algorithm/code.js
@@ -4,7 +4,7 @@ function filledArray(length, value) {
   return Array(...Array(length)).map(Number.prototype.valueOf, value);
 }
 
-const G = Randomize.graph(5, { ratio: 0.4 });
+const G = new Randomize.Graph(5, .4).create();
 let ranks;
 const outgoingEdgeCounts = filledArray(G.length, 0);
 let incomingNodes;
@@ -18,7 +18,7 @@ const logger = new LogTracer();
 graphTracer.set(G);
 oecTracer.set(outgoingEdgeCounts);
 
-for (incomingNodes = []; incomingNodes.length < G.length; incomingNodes.push(filledArray(G.length, -1)));
+for (incomingNodes = []; incomingNodes.length < G.length; incomingNodes.push(filledArray(G.length, -1))) ;
 inTracer.set(incomingNodes).delay();
 
 /*
diff --git a/Graph Search/Shortest Path (BFS)/code.js b/Graph Search/Shortest Path (BFS)/code.js
@@ -3,9 +3,7 @@ import { GraphTracer, LogTracer, Randomize } from 'algorithm-visualizer';
 const tracer = new GraphTracer().directed(false).weighted();
 const logger = new LogTracer();
 tracer.log(logger);
-const G = Randomize.graph(5, {
-  directed: false, weighted: true, ratio: 1, min: 1, max: 9,
-});
+const G = new Randomize.Graph(5, 1).directed(false).weighted().create();
 tracer.set(G).delay();
 
 function BFS() {
@@ -33,10 +31,11 @@ function BFS() {
   }
   return W[e];
 }
-let s = Randomize.integer(0, G.length - 1); // s = start node
+
+let s = new Randomize.Integer(0, G.length - 1).create(); // s = start node
 let e; // e = start node
 do {
-  e = Randomize.integer(0, G.length - 1);
+  e = new Randomize.Integer(0, G.length - 1).create();
 } while (s === e);
 let MAX_VALUE = Infinity;
 logger.print(`finding the shortest path from ${s} to ${e}`);
diff --git a/Graph Search/Shortest Path (DFS)/code.js b/Graph Search/Shortest Path (DFS)/code.js
@@ -3,9 +3,7 @@ import { GraphTracer, LogTracer, Randomize } from 'algorithm-visualizer';
 const tracer = new GraphTracer().directed(false).weighted();
 const logger = new LogTracer();
 tracer.log(logger);
-const G = Randomize.graph(5, {
-  directed: false, weighted: true, ratio: 1, min: 1, max: 9,
-});
+const G = new Randomize.Graph(5, 1).directed(false).weighted().create();
 tracer.set(G).delay();
 
 function DFS(node, parent, weight) { // node = current node, parent = previous node
@@ -30,10 +28,11 @@ function DFS(node, parent, weight) { // node = current node, parent = previous n
   D[node] = false; // label current node as undiscovered
   tracer.leave(node, parent, 0).delay();
 }
-const s = Randomize.integer(0, G.length - 1); // s = start node
+
+const s = new Randomize.Integer(0, G.length - 1).create(); // s = start node
 let e; // e = end node
 do {
-  e = Randomize.integer(0, G.length - 1);
+  e = new Randomize.Integer(0, G.length - 1).create();
 } while (s === e);
 const MAX_VALUE = Infinity;
 let minWeight = MAX_VALUE;
diff --git a/Minimum Spanning Tree/Kruskal's Algorithm/code.js b/Minimum Spanning Tree/Kruskal's Algorithm/code.js
@@ -9,9 +9,7 @@ const logger = new LogTracer();
  [0, 2, 0, 0, 1],
  [0, 1, 3, 0, 0]
  ]; */
-const G = Randomize.graph(5, {
-  directed: false, weighted: true, ratio: 1, min: 1, max: 9,
-});
+const G = new Randomize.Graph(5, 1).directed(false).weighted().create();
 tracer.set(G).delay();
 
 function kruskal() {
diff --git a/Minimum Spanning Tree/Prim's Algorithm/code.js b/Minimum Spanning Tree/Prim's Algorithm/code.js
@@ -10,9 +10,7 @@ tracer.log(logger);
  [0, 2, 0, 0, 1],
  [0, 1, 3, 0, 0]
  ]; */
-const G = Randomize.graph(10, {
-  directed: false, weighted: true, ratio: 0.4, min: 1, max: 9,
-});
+const G = new Randomize.Graph(10, .4).directed(false).weighted().create();
 tracer.set(G).delay();
 
 function prim() {
diff --git a/Search/Binary Search (Iterative)/code.js b/Search/Binary Search (Iterative)/code.js
@@ -3,7 +3,7 @@ import { Array1DTracer, ChartTracer, LogTracer, Randomize } from 'algorithm-visu
 const chart = new ChartTracer();
 const tracer = new Array1DTracer().chart(chart);
 const logger = new LogTracer();
-const D = Randomize.array1D(15, { sorted: true, min: 0, max: 50 });
+const D = new Randomize.Array1D(15, new Randomize.Integer(0, 50)).sorted().create();
 tracer.set(D).delay();
 
 function BinarySearch(array, element) { // array = sorted array, element = element to be found
@@ -39,7 +39,7 @@ function BinarySearch(array, element) { // array = sorted array, element = eleme
   return -1;
 }
 
-const element = D[Randomize.integer(0, D.length - 1)];
+const element = D[new Randomize.Integer(0, D.length - 1).create()];
 
 logger.print(`Using iterative binary search to find ${element}`);
 BinarySearch(D, element);
diff --git a/Search/Binary Search (Recursive)/code.js b/Search/Binary Search (Recursive)/code.js
@@ -3,7 +3,7 @@ import { Array1DTracer, ChartTracer, LogTracer, Randomize } from 'algorithm-visu
 const chart = new ChartTracer();
 const tracer = new Array1DTracer().chart(chart);
 const logger = new LogTracer();
-const D = Randomize.array1D(15, { sorted: true, min: 0, max: 50 });
+const D = new Randomize.Array1D(15, new Randomize.Integer(0, 50)).sorted().create();
 tracer.set(D).delay();
 
 function BinarySearch(array, element, minIndex, maxIndex) { // array = sorted array, element = element to be found, minIndex = low index, maxIndex = high index
@@ -41,7 +41,7 @@ function BinarySearch(array, element, minIndex, maxIndex) { // array = sorted ar
   return -1;
 }
 
-const element = D[Randomize.integer(0, D.length - 1)];
+const element = D[new Randomize.Integer(0, D.length - 1).create()];
 
 logger.print(`Using binary search to find ${element}`);
 BinarySearch(D, element, 0, D.length - 1);
diff --git a/Sorting/Bubble Sort/code.js b/Sorting/Bubble Sort/code.js
@@ -3,7 +3,7 @@ import { Array1DTracer, ChartTracer, LogTracer, Randomize } from 'algorithm-visu
 const chart = new ChartTracer();
 const tracer = new Array1DTracer().chart(chart);
 const logger = new LogTracer();
-const D = Randomize.array1D(15);
+const D = new Randomize.Array1D(15).create();
 tracer.set(D).delay();
 
 logger.print(`original array = [${D.join(', ')}]`);
diff --git a/Sorting/Bucket Sort/code.js b/Sorting/Bucket Sort/code.js
@@ -5,7 +5,7 @@ const arraySize = 10;
 const numBuckets = 5;
 
 // initialize array values
-const array = Randomize.array1D(arraySize, { min: 0, max: maxValue - 1 });
+const array = new Randomize.Array1D(arraySize, new Randomize.Integer(0, maxValue - 1)).create();
 const buckets = [];
 const bucketsCount = [];
 const sortedArray = [];
diff --git a/Sorting/Comb Sort/code.js b/Sorting/Comb Sort/code.js
@@ -3,7 +3,7 @@ import { Array1DTracer, ChartTracer, LogTracer, Randomize } from 'algorithm-visu
 const chart = new ChartTracer();
 const tracer = new Array1DTracer().chart(chart);
 const logger = new LogTracer();
-const D = Randomize.array1D(15);
+const D = new Randomize.Array1D(15).create();
 tracer.set(D).delay();
 
 logger.print(`original array = [${D.join(', ')}]`);
diff --git a/Sorting/Counting Sort/code.js b/Sorting/Counting Sort/code.js
@@ -4,7 +4,7 @@ const maxValue = 9;
 const arrSize = 10;
 
 // initialize array values
-const A = Randomize.array1D(arrSize, { min: 0, max: maxValue });
+const A = new Randomize.Array1D(arrSize, new Randomize.Integer(0, maxValue)).create();
 const counts = [];
 const sortedA = [];
 for (let i = 0; i <= maxValue; i++) {
diff --git a/Sorting/Cycle Sort/code.js b/Sorting/Cycle Sort/code.js
@@ -3,7 +3,7 @@ import { Array1DTracer, ChartTracer, LogTracer, Randomize } from 'algorithm-visu
 const chart = new ChartTracer();
 const tracer = new Array1DTracer().chart(chart);
 const logger = new LogTracer();
-const D = Randomize.array1D(15);
+const D = new Randomize.Array1D(15).create();
 tracer.set(D).delay();
 
 logger.print(`original array = [${D.join(', ')}]`);
diff --git a/Sorting/Heapsort/code.js b/Sorting/Heapsort/code.js
@@ -3,7 +3,7 @@ import { Array1DTracer, ChartTracer, LogTracer, Randomize } from 'algorithm-visu
 const chart = new ChartTracer();
 const tracer = new Array1DTracer().chart(chart);
 const logger = new LogTracer();
-const D = Randomize.array1D(10);
+const D = new Randomize.Array1D(10).create();
 tracer.set(D).delay();
 
 logger.print(`Original array = [${D.join(', ')}]`);
diff --git a/Sorting/Insertion Sort/code.js b/Sorting/Insertion Sort/code.js
@@ -3,7 +3,7 @@ import { Array1DTracer, ChartTracer, LogTracer, Randomize } from 'algorithm-visu
 const chart = new ChartTracer();
 const tracer = new Array1DTracer().chart(chart);
 const logger = new LogTracer();
-const D = Randomize.array1D(15);
+const D = new Randomize.Array1D(15).create();
 tracer.set(D).delay();
 
 logger.print(`original array = [${D.join(', ')}]`);
diff --git a/Sorting/LSD Radix Sort/code.js b/Sorting/LSD Radix Sort/code.js
@@ -2,7 +2,7 @@ import { Array2DTracer, LogTracer, Randomize } from 'algorithm-visualizer';
 
 const tracer = new Array2DTracer();
 const logger = new LogTracer();
-const k = Randomize.array1D(10, { min: 1, max: 999 });
+const k = new Randomize.Array1D(10, new Randomize.Integer(1, 999)).create();
 const D = [
   k,
   [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
@@ -11,16 +11,19 @@ const D = [
 tracer.set(D).delay();
 
 logger.print(`original array = [${D[0].join(', ')}]`);
+
 function pow(base, expo) {
   let ans = 1;
   for (let i = 0; i < expo; i++) {
     ans *= base;
   }
   return ans;
 }
+
 function digit(i, exp) {
   return parseInt(D[0][i] / pow(10, exp) % 10);
 }
+
 for (let exp = 0; exp < 3; exp++) {
   logger.print(`Digit: ${exp}`);
   let i;
diff --git a/Sorting/Merge Sort (Bottom-Up)/code.js b/Sorting/Merge Sort (Bottom-Up)/code.js
@@ -3,8 +3,8 @@ import { Array2DTracer, LogTracer, Randomize } from 'algorithm-visualizer';
 const tracer = new Array2DTracer();
 const logger = new LogTracer();
 const D = [
-  Randomize.array1D(20, { min: 0, max: 50 }),
-  Randomize.array1D(20, { min: 0, max: 0 }),
+  new Randomize.Array1D(20, { min: 0, max: 50 }),
+  new Randomize.Array1D(20, { min: 0, max: 0 }),
 ];
 
 tracer.set(D).delay();
diff --git a/Sorting/Merge Sort (Top-Down)/code.js b/Sorting/Merge Sort (Top-Down)/code.js
diff --git a/Sorting/Pancake Sort/code.js b/Sorting/Pancake Sort/code.js
diff --git a/Sorting/Pigeonhole Sort/code.js b/Sorting/Pigeonhole Sort/code.js
diff --git a/Sorting/Quicksort/code.js b/Sorting/Quicksort/code.js
diff --git a/Sorting/Selection Sort/code.js b/Sorting/Selection Sort/code.js
diff --git a/Sorting/Shellsort/code.js b/Sorting/Shellsort/code.js
diff --git a/Tree/Binary Search Tree Searching/code.js b/Tree/Binary Search Tree Searching/code.js

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,7 @@ import { GraphTracer, LogTracer, Randomize } from 'algorithm-visualizer';`
`3`	`3`	`const tracer = new GraphTracer().weighted();`
`4`	`4`	`const logger = new LogTracer();`
`5`	`5`	`tracer.log(logger);`
`6`		`-const G = Randomize.graph(5, {`
`7`		`- directed: true, weighted: true, ratio: 1, min: 1, max: 9,`
`8`		`-});`
	`6`	`+const G = new Randomize.Graph(5, 1).weighted().create();`
`9`	`7`	`tracer.set(G).delay();`
`10`	`8`
`11`	`9`	`function FloydWarshall() {`
`@@ -48,6 +46,7 @@ function FloydWarshall() {`
`48`	`46`	`}`
`49`	`47`	`}`
`50`	`48`	`}`
	`49`	`+`
`51`	`50`	`let MAX_VALUE = Infinity;`
`52`	`51`	`logger.print('finding the shortest paths from and to all nodes');`
`53`	`52`	`FloydWarshall();`