array var overruns + mergesort polishing

Author: lee-naish

src/algorithms/controllers/MSDRadixSort.js

@@ -34,13 +34,13 @@ const STACK_FRAME_COLOR = {
 const VIS_VARIABLE_STRINGS = {
   i_left_index: 'i',
   j_right_index: 'j',
-  i_eq_0: 'i==0',
-  i_gt_n: 'i==n+1',
-  j_eq_0: 'j==0',
-  j_gt_n: 'j==n+1',
+  i_eq_0: 'i=0',
+  i_gt_n: 'i=n+1',
+  j_eq_0: 'j=0',
+  j_gt_n: 'j=n+1',
   left: 'left',
   right: 'right',
-  right_eq_0: 'right==0'
+  right_eq_0: 'right=0'
 };
 
 const MSD_BOOKMARKS = {

src/algorithms/controllers/msort_arr_bup.js

@@ -149,8 +149,8 @@ export function run_msort() {
       // before loop exit
       /* eslint-disable no-constant-condition */
       while (true) {
-        chunker.add('MergeAllWhile', () => {
-          //no animation
+        chunker.add('MergeAllWhile', (vis) => {
+          assignVarToA(vis, 'right', undefined, size);
         }, []);
         if ((left + runlength) >= size)
           break;
@@ -338,9 +338,8 @@ export function run_msort() {
         chunker.add('left2', (vis, a, c_left, c_right, c_rlength) => {
           vis.array.set(a, 'msort_arr_bup'); //unhighlight array a
           set_simple_stack(vis.array, [`runlength = ${c_rlength}`]);
-
-          if (c_left < size) assignVarToA(vis, 'left', c_left, size);
-          assignVarToA(vis, "right", c_right, size);
+          assignVarToA(vis, 'left', c_left, size);
+          assignVarToA(vis, 'right', c_right, size);
 
         }, [A, left, right, runlength]);
 
@@ -349,7 +348,8 @@ export function run_msort() {
       runlength = 2 * runlength;
 
       chunker.add('mergeDone', (vis, c_rlength) => {
-        assignVarToA(vis, "right", undefined, size);
+        assignVarToA(vis, 'left', undefined, size);
+        // assignVarToA(vis, 'right', undefined, size);
         highlightAllRunlengths(vis, c_rlength, runAColor, runBColor, size);
       }, [runlength])
 

src/algorithms/controllers/msort_arr_nat.js

@@ -158,8 +158,8 @@ export function run_msort() {
       }, [left]);
 
       do {
-        chunker.add('MergeAllWhile', () => {
-          // no animation
+        chunker.add('MergeAllWhile', (vis) => {
+          assignVarToA(vis, 'right', undefined, size);
         }, []);
 
         // finding the first run, A[left..mid]
@@ -184,8 +184,8 @@ export function run_msort() {
         // finding the second run, A[mid+1..right]
         let right = mid + 1;
         chunker.add('right', (vis, c_right) => {
+          assignVarToA(vis, 'right', c_right, size);
           if (right < size) {
-            assignVarToA(vis, 'right', c_right, size);
             highlight(vis, c_right, runBColor);
           }
         }, [right]);
@@ -383,11 +383,9 @@ export function run_msort() {
         chunker.add('left2', (vis, a, c_left, c_right, c_rcount) => {
           vis.array.set(a, 'msort_arr_nat'); // unhighlight array a
           set_simple_stack(vis.array, [`runcount = ${c_rcount}`]);
-          if (c_left < size) {
-            assignVarToA(vis, 'left', c_left, size);
-            assignVarToA(vis, "right", c_right, size);
-          }
-          // assignVarToA(vis, "size", size, size);
+          assignVarToA(vis, 'left', c_left, size);
+          assignVarToA(vis, 'right', c_right, size);
+          // assignVarToA(vis, 'size', size-1, size);
 
 
         }, [A, left, right, runcount]);
@@ -396,6 +394,8 @@ export function run_msort() {
 
       chunker.add('mergeDone', (vis, a) => {
         highlightNaturalRuns(vis, a, runAColor, runBColor);
+        assignVarToA(vis, 'left', undefined, size);
+        assignVarToA(vis, 'right', undefined, size);
       }, [A])
 
     } while (runcount > 1);

src/algorithms/controllers/msort_arr_td.js

@@ -346,9 +346,11 @@ export function run_msort() {
           else
             highlight(vis, i, runBColor);
         }
-        if (cur_ap2 < a.length) { // XXX 
+        if (cur_ap2 < a.length) { // can't render beyond array:(
           assignVarToA(vis, 'ap2', cur_ap2);
+          assignVarToA(vis, 'ap2='+(a.length+1), undefined);
         } else {
+          assignVarToA(vis, 'ap2='+(a.length+1), a.length - 1);
           assignVarToA(vis, 'ap2', undefined);
         }
         assignVarToA(vis, 'max2', cur_max2);

src/algorithms/controllers/msort_lista_td.js

@@ -216,7 +216,7 @@ export function run_msort() {
     // Define quicksort functions
     // ----------------------------------------------------------------------------------------------------------------------------
 
-    // XXX unused currently
+    // XXX unused currently (also modified in msort_arr_td.js)
     function renderInMerge(vis, a, b, cur_left, cur_ap1, cur_ap2, cur_bp, cur_max1, cur_max2, c_stk) { 
       if (isMergeExpanded()) {
         vis.array.set(a, 'msort_lista_td');

src/algorithms/controllers/msort_shared.js

@@ -87,15 +87,20 @@ export function highlight2Runlength(vis, left, mid, right, colorA, colorB) {
 // Assigns label to array A at index, checks if index is greater than size of array
 // if index is greater than size, assign label to last element in array
 export function assignVarToA(vis, variable_name, index, size) {
-    if (index === undefined)
+    if (index === undefined) {
         vis.array.removeVariable(variable_name);
-    else if (index >= size)
-        vis.array.assignVariable(variable_name, size - 1)
-    else
+        // may need to remove out of bounds version also
+        vis.array.removeVariable(variable_name+'>'+size);
+    } else if (index >= size) { // can't render beyond array:(
+        vis.array.assignVariable(variable_name+'>'+size, size - 1)
+        vis.array.removeVariable(variable_name);
+    } else {
         vis.array.assignVariable(variable_name, index);
+        vis.array.removeVariable(variable_name+'>'+size);
+    }
 }
 
-// Same as above function bet also checks if array B is displayed
+// Same as above function but also checks if array B is displayed
 export function assignVarToB(vis, variable_name, index, size) {
     if (isMergeExpanded()) {
         if (index === undefined)

src/algorithms/controllers/quickSort_shared.js

@@ -53,8 +53,8 @@ export function isRecursionExpanded() {
 const VIS_VARIABLE_STRINGS = {
   i_left_index: 'i',
   j_right_index: 'j',
-  i_eq_0: 'i==0',
-  j_eq_0: 'j==0',
+  i_eq_0: 'i=0',
+  j_eq_0: 'j=0',
   pivot: 'pivot',
 };
 

src/algorithms/pseudocode/msort_arr_nat.js

@@ -47,7 +47,7 @@ MergeAll
         \\In}
         runcount <- runcount + 1 \\B runcount+
         left <- right + 1 // skip to the next pair of runs (if any) \\B left2
-    until left >= size
+    until left > size
     \\In}
     // all consecutive pairs of runs merged \\B mergeDone
 \\Code}