msort_arr_bup bug fix++

Author: lee-naish

src/algorithms/controllers/msort_arr_bup.js

@@ -144,10 +144,15 @@ export function run_msort() {
         // highlight2Runlength(vis, left_2, mid_2, right_2, runAColor, runBColor);
       }, [A, left, runlength]);
 
-      while ((left + runlength) <= size) {
+      // while ((left + runlength) < size) - want to show this chunk
+      // before loop exit
+      /* eslint-disable no-constant-condition */
+      while (true) {
         chunker.add('MergeAllWhile', () => {
           //no animation
         }, []);
+        if ((left + runlength) >= size)
+          break;
 
         let mid = left + runlength - 1;
         let right = Math.min(mid + runlength, (size - 1));

src/algorithms/controllers/msort_arr_td.js

@@ -10,7 +10,7 @@
 import { msort_arr_td } from '../explanations';
 import {colors} from '../../components/DataStructures/colors';
 
-// Should be consistent with BUP/Nat merge sort
+// Animation should be consistent with BUP/Nat merge sort
 // XXX (could make code more similar and use shared code here)
 const apColor = colors.apple;
 const runAColor = colors.peach;
@@ -619,6 +619,12 @@ export function run_msort() {
             if (cur_ap2 < a.length)
               assignVarToA(vis, 'ap2', cur_ap2);
             assignVarToA(vis, 'max2', cur_max2);
+            for (let i = cur_left; i <= cur_max1; i++) {
+              highlight(vis, i, runAColor);
+            }
+            for (let i = cur_max1 + 1; i <= cur_max2; i++) {
+              highlight(vis, i, runBColor);
+            }
             vis.arrayB.set(b, 'msort_arr_td');
             for (let i = cur_left; i <= cur_bp - 1; i++) {
               highlightB(vis, i, sortColor);

src/algorithms/pseudocode/msort_arr_bup.js

@@ -30,6 +30,8 @@ MergeAll
     \\Expl{ Unless size is a power of two there can be times when the
         number of runs is odd and we have a "leftover" run at the end
         (with length <= runlength), that will be merged in a later iteration.
+        If left is not displayed it is one past the right end of the
+        array.
     \\Expl}
     \\In{
         mid <- left + runlength - 1 // first run is A[left..mid] \\B mid