@@ -346,8 +346,8 @@ export function run_msort() {
346
346
A [ ap2 ] = undefined ;
347
347
348
348
chunker . add ( 'copyap2' , ( vis , a , b , c_ap1 , c_ap2 , c_bp , c_max1 , c_max2 , c_left , c_right , c_mid , c_rcount ) => {
349
- if ( isMergeExpanded ( ) ) vis . arrayB . set ( b , 'msort_arr_bup ' ) ;
350
- vis . array . set ( a , 'msort_arr_bup ' ) ;
349
+ if ( isMergeExpanded ( ) ) vis . arrayB . set ( b , 'msort_arr_nat ' ) ;
350
+ vis . array . set ( a , 'msort_arr_nat ' ) ;
351
351
displayMergeLabels ( vis , c_ap1 , c_max1 , c_ap2 , c_max2 , c_bp , size ) ;
352
352
// future color: should be colorA & colorB
353
353
highlight2Runlength ( vis , c_left , c_mid , c_right , colorA , colorA ) ;
@@ -374,8 +374,8 @@ export function run_msort() {
374
374
}
375
375
chunker . add ( 'CopyRest1' , ( vis , a , b , c_ap1 , c_max1 , c_left , c_right , c_mid , c_bp , c_rcount ) => {
376
376
377
- vis . array . set ( a , 'msort_arr_bup ' ) ;
378
- if ( isMergeExpanded ( ) ) vis . arrayB . set ( b , 'msort_arr_bup ' ) ;
377
+ vis . array . set ( a , 'msort_arr_nat ' ) ;
378
+ if ( isMergeExpanded ( ) ) vis . arrayB . set ( b , 'msort_arr_nat ' ) ;
379
379
380
380
// copying A[ap1..max1]
381
381
assignVarToA ( vis , 'ap1' , c_ap1 , size ) ;
@@ -396,8 +396,8 @@ export function run_msort() {
396
396
bp = bp + 1 ;
397
397
}
398
398
chunker . add ( 'CopyRest2' , ( vis , a , b , c_ap2 , c_max2 , c_left , c_right , c_mid , c_rcount ) => {
399
- vis . array . set ( a , 'msort_arr_bup ' ) ;
400
- if ( isMergeExpanded ( ) ) vis . arrayB . set ( b , 'msort_arr_bup ' ) ;
399
+ vis . array . set ( a , 'msort_arr_nat ' ) ;
400
+ if ( isMergeExpanded ( ) ) vis . arrayB . set ( b , 'msort_arr_nat ' ) ;
401
401
assignVarToA ( vis , 'ap2' , c_ap2 , size ) ;
402
402
assignVarToA ( vis , 'max2' , c_max2 , size ) ;
403
403
@@ -415,24 +415,25 @@ export function run_msort() {
415
415
B [ i ] = undefined ;
416
416
}
417
417
chunker . add ( 'copyBA' , ( vis , a , b , c_left , c_right , c_rcount ) => {
418
- vis . array . set ( a , 'msort_arr_bup ' ) ;
419
- if ( isMergeExpanded ( ) ) vis . arrayB . set ( b , 'msort_arr_bup ' ) ;
418
+ vis . array . set ( a , 'msort_arr_nat ' ) ;
419
+ if ( isMergeExpanded ( ) ) vis . arrayB . set ( b , 'msort_arr_nat ' ) ;
420
420
421
421
// highlight all sorted elements green
422
422
for ( let i = c_left ; i <= c_right ; i ++ ) highlight ( vis , i , colorC ) ;
423
423
set_simple_stack ( vis . array , [ c_rcount ] ) ;
424
424
} , [ A , B , left , right , runcount ] ) ;
425
425
426
- runcount = runcount + 1 ;
427
- chunker . add ( 'runcount+' , ( vis , c_rcount ) => {
428
- set_simple_stack ( vis . array , [ c_rcount ] ) ;
429
- } , [ runcount ] ) ;
426
+
430
427
}
428
+ runcount = runcount + 1 ;
429
+ chunker . add ( 'runcount+' , ( vis , c_rcount ) => {
430
+ set_simple_stack ( vis . array , [ c_rcount ] ) ;
431
+ } , [ runcount ] ) ;
431
432
432
433
let left2 = left ;
433
434
left = right + 1 ;
434
435
chunker . add ( 'left2' , ( vis , a , c_left , c_rcount ) => {
435
- vis . array . set ( a , 'msort_arr_bup ' ) ;
436
+ vis . array . set ( a , 'msort_arr_nat ' ) ;
436
437
437
438
set_simple_stack ( vis . array , [ c_rcount ] ) ;
438
439
0 commit comments