fix: at the end only display "DONE" as the label for array a

Author: dwangng

src/algorithms/controllers/msort_arr_bup.js

@@ -120,7 +120,7 @@ export function run_msort() {
 
     chunker.add('runlength', (vis, c_rlength) => {
       assignVarToA(vis, "runlength", c_rlength - 1, size);
-      set_simple_stack(vis.array, [c_rlength]);
+      set_simple_stack(vis.array, [`runlength = ${c_rlength}`]);
       highlightAllRunlengths(vis, c_rlength, runAColor, runBColor, size);
     }, [runlength]);
 
@@ -135,7 +135,7 @@ export function run_msort() {
       chunker.add('left', (vis, a, c_left, c_rlength) => {
         vis.array.set(a, 'msort_arr_bup'); // unhighlight arrayA
         assignVarToA(vis, 'left', c_left, size);
-        set_simple_stack(vis.array, [c_rlength]);
+        set_simple_stack(vis.array, [`runlength = ${c_rlength}`]);
         let left_2 = c_left;
         let mid_2 = (c_rlength + c_left - 1);
         let right_2 = (Math.min(c_rlength * 2, size) - 1);
@@ -307,7 +307,7 @@ export function run_msort() {
 
         chunker.add('copyBA', (vis, a, b, c_left, c_right, c_rlength) => {
           vis.array.set(a, 'msort_arr_bup');
-          set_simple_stack(vis.array, [c_rlength]);
+          set_simple_stack(vis.array, [`runlength = ${c_rlength}`]);
 
           if (isMergeExpanded()) vis.arrayB.set(b, 'msort_arr_bup');
 
@@ -320,7 +320,7 @@ export function run_msort() {
 
         chunker.add('left2', (vis, a, c_left, c_rlength) => {
           vis.array.set(a, 'msort_arr_bup'); //unhighlight array a
-          set_simple_stack(vis.array, [c_rlength]);
+          set_simple_stack(vis.array, [`runlength = ${c_rlength}`]);
 
           if (c_left < size) assignVarToA(vis, 'left', c_left, size);
 
@@ -345,7 +345,7 @@ export function run_msort() {
       chunker.add('runlength2', (vis, c_rlength) => {
 
         assignVarToA(vis, 'left', undefined, size);
-        set_simple_stack(vis.array, [c_rlength]);
+        set_simple_stack(vis.array, [`runlength = ${c_rlength}`]);
 
         if (c_rlength < size) {
           assignVarToA(vis, "runlength", c_rlength - 1, size);
@@ -359,7 +359,7 @@ export function run_msort() {
       for (let i = 0; i < size; i++) {
         highlight(vis, i, sortColor);
       }
-      assignVarToA(vis, 'Done', size, size);
+
       set_simple_stack(vis.array, ["DONE"]);
 
     }, []);

src/algorithms/controllers/msort_arr_nat.js

@@ -145,7 +145,8 @@ export function run_msort() {
 
       chunker.add('runcount', (vis, a, c_rcount) => {
         vis.array.set(a, 'msort_arr_nat');
-        set_simple_stack(vis.array, [c_rcount]);
+        set_simple_stack(vis.array, [`runcount = ${c_rcount}`]);
+
       }, [A, runcount]);
 
       chunker.add('left', (vis, c_left) => {
@@ -352,19 +353,19 @@ export function run_msort() {
             if (isMergeExpanded()) vis.arrayB.set(b, 'msort_arr_nat');
             // highlight all sorted elements green
             for (let i = c_left; i <= c_right; i++) highlight(vis, i, sortColor);
-            set_simple_stack(vis.array, [c_rcount]);
+            set_simple_stack(vis.array, [`runcount = ${c_rcount}`]);
           }, [A, B, left, right, runcount]);
         }
 
         runcount = runcount + 1;
         chunker.add('runcount+', (vis, c_rcount) => {
-          set_simple_stack(vis.array, [c_rcount]);
+          set_simple_stack(vis.array, [`runcount = ${c_rcount}`]);
         }, [runcount]);
 
         left = right + 1;
         chunker.add('left2', (vis, a, c_left, c_rcount) => {
           vis.array.set(a, 'msort_arr_nat'); // unhighlight array a
-          set_simple_stack(vis.array, [c_rcount]);
+          set_simple_stack(vis.array, [`runcount = ${c_rcount}`]);
           if (c_left < size) assignVarToA(vis, 'left', c_left);
         }, [A, left, runcount]);
 

src/algorithms/controllers/msort_shared.js

@@ -111,5 +111,8 @@ export function resetArrayA(vis, arr_type, A, left, mid, right, stack, colorA, c
     if (arr_type === "nat") vis.array.set(A, 'msort_arr_nat');
 
     highlight2Runlength(vis, left, mid, right, colorA, colorB);
-    set_simple_stack(vis.array, [stack]);
+
+
+    if (arr_type === "bup") set_simple_stack(vis.array, [`runlength = ${stack}`]);
+    if (arr_type === "nat") set_simple_stack(vis.array, [`runcount = ${stack}`]);
 }

src/components/DataStructures/Array/Array1DRenderer/index.js

@@ -228,14 +228,14 @@ class Array1DRenderer extends Array2DRenderer {
             <caption
               className={styles.captionmsort_arr_bup}
               kth-tag="msort_arr_bup_caption"
-            > runlength = &emsp; {listOfNumbers}&emsp;&emsp; </caption>)
+            > &emsp; {listOfNumbers}&emsp;&emsp; </caption>)
         }
         {
           algo === 'msort_arr_nat' && listOfNumbers && (
             <caption
               className={styles.captionmsort_arr_nat}
               kth-tag="msort_arr_nat_caption"
-            > runcount = &emsp; {listOfNumbers}&emsp;&emsp; </caption>)
+            > &emsp; {listOfNumbers}&emsp;&emsp; </caption>)
         }
       </table>
     );