feat: left ← right line shows the left and right labels for nat and bup

Author: dwangng

src/algorithms/controllers/msort_arr_bup.js

@@ -16,7 +16,8 @@ import {
   displayMergeLabels,
   highlightAPointers,
   set_simple_stack,
-  resetArrayA
+  resetArrayA,
+  highlightFromTo
 } from './msort_shared.js';
 
 
@@ -149,13 +150,15 @@ export function run_msort() {
 
         let mid = left + runlength - 1;
         let right = Math.min(mid + runlength, (size - 1));
-        chunker.add('mid', (vis, c_mid) => {
+        chunker.add('mid', (vis, c_mid, c_left) => {
           assignVarToA(vis, 'mid', c_mid, size);
-        }, [mid]);
-        chunker.add('right', (vis, c_right) => {
+          //highlightFromTo(vis, c_left, c_mid, runAColor);
+        }, [mid, left]);
+        chunker.add('right', (vis, c_right, c_mid) => {
           assignVarToA(vis, 'right', c_right, size);
+          //highlightFromTo(vis, c_mid + 1, c_right, runBColor);
 
-        }, [right]);
+        }, [right, mid]);
 
         // start merge[left, mid, right] ------------------------------------------------------------
         let ap1 = left;
@@ -314,31 +317,39 @@ export function run_msort() {
           // highlight all sorted elements green
           for (let i = c_left; i <= c_right; i++) highlight(vis, i, sortColor);
 
+          assignVarToA(vis, "left", c_left, size);
+          assignVarToA(vis, "right", c_right, size);
+
         }, [A, B, left, right, runlength]);
 
         left = right + 1;
 
-        chunker.add('left2', (vis, a, c_left, c_rlength) => {
+        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);
 
           if ((c_left + c_rlength) < size) {
             let left_2 = c_left;
             let mid_2 = (c_rlength + c_left - 1);
             let right_2 = (Math.min((mid_2 + c_rlength + 1), size) - 1);
             highlight2Runlength(vis, left_2, mid_2, right_2, runAColor, runBColor);
           }
+          if ((c_left + c_rlength) >= size) {
+            highlightFromTo(vis, c_left, size - 1, runAColor);
+          }
 
 
-        }, [A, left, runlength]);
+        }, [A, left, right, runlength]);
 
       }
 
       runlength = 2 * runlength;
 
       chunker.add('mergeDone', (vis, c_rlength) => {
+        assignVarToA(vis, "right", undefined, size);
         highlightAllRunlengths(vis, c_rlength, runAColor, runBColor, size);
       }, [runlength])
 

src/algorithms/controllers/msort_arr_nat.js

@@ -14,7 +14,8 @@ import {
   displayMergeLabels,
   highlightAPointers,
   set_simple_stack,
-  resetArrayA
+  resetArrayA,
+  highlightFromTo
 } from './msort_shared.js';
 
 const run = run_msort();
@@ -354,20 +355,30 @@ export function run_msort() {
             // highlight all sorted elements green
             for (let i = c_left; i <= c_right; i++) highlight(vis, i, sortColor);
             set_simple_stack(vis.array, [`runcount = ${c_rcount}`]);
+
+            assignVarToA(vis, "left", c_left, size);
+            assignVarToA(vis, "right", c_right, size);
+
           }, [A, B, left, right, runcount]);
         }
 
         runcount = runcount + 1;
-        chunker.add('runcount+', (vis, c_rcount) => {
+        chunker.add('runcount+', (vis, c_left, c_mid, c_rcount) => {
+          highlightFromTo(vis, c_left, c_mid, sortColor);
           set_simple_stack(vis.array, [`runcount = ${c_rcount}`]);
-        }, [runcount]);
+        }, [left, mid, runcount]);
 
         left = right + 1;
-        chunker.add('left2', (vis, a, c_left, c_rcount) => {
+        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);
-        }, [A, left, runcount]);
+          if (c_left < size) {
+            assignVarToA(vis, 'left', c_left, size);
+            assignVarToA(vis, "right", c_right, size);
+          }
+
+
+        }, [A, left, right, runcount]);
 
       } while (left < size);
 

src/algorithms/controllers/msort_shared.js

@@ -49,6 +49,14 @@ export function unhighlight(vis, index, color) {
     }
 }
 
+// Highlights one runlength 
+export function highlightFromTo(vis, from, to, color) {
+    // highlight first runlength color A
+    for (let i = from; i <= to; i++) {
+        highlight(vis, i, color);
+    }
+}
+
 // Highlights two runlengths two colours
 export function highlight2Runlength(vis, left, mid, right, colorA, colorB) {
     // highlight first runlength color A