Add TwinSort to Run All (and improve visualization of NaturalMergeSort)

Gaming32 · Feb 2, 2021 · b0172d4 · b0172d4
1 parent bf7fe3e
commit b0172d4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/sorts/merge/NaturalMergeSort.java b/src/sorts/merge/NaturalMergeSort.java
@@ -4,6 +4,8 @@
 import sorts.templates.Sort;
 
 final public class NaturalMergeSort extends Sort {
+    int[] merged;
+
     public NaturalMergeSort(ArrayVisualizer arrayVisualizer) {
         super(arrayVisualizer);
         this.setSortListName("Natural Merge");
@@ -19,7 +21,6 @@ public NaturalMergeSort(ArrayVisualizer arrayVisualizer) {
     }
 
     private void merge(int[] arr, int left, int right, int stop) {
-        int[] merged = Writes.createExternalArray(stop - left);
         boolean first = true;
         int index = 0;
         int start = 0;
@@ -41,13 +42,11 @@ private void merge(int[] arr, int left, int right, int stop) {
         Highlights.clearMark(2);
         for (int i = start; i < index; i++)
             Writes.write(arr, i + origLeft, merged[i], 1, true, false);
-        for (int i = start; i < index; i++)
-            merged[i] = 0;
-        Writes.deleteExternalArray(merged);
     }
 
     @Override
     public void runSort(int[] arr, int length, int bucketCount) {
+        merged = Writes.createExternalArray(length);
         boolean done = false;
         int start = 0;
         int stop = length - 1;
@@ -75,5 +74,6 @@ public void runSort(int[] arr, int length, int bucketCount) {
                 stop = left;
             }
         }
+        Writes.deleteExternalArray(merged);
     }
 }
diff --git a/src/threads/RunMergeSorts.java b/src/threads/RunMergeSorts.java
@@ -34,8 +34,9 @@ of this software and associated documentation files (the "Software"), to deal
 final public class RunMergeSorts extends MultipleSortThread {
     private Sort MergeSort;
     private Sort BottomUpMergeSort;
-    private Sort NaturalMergeSort;
     private Sort PartialMergeSort;
+    private Sort TwinSort;
+    private Sort NaturalMergeSort;
     private Sort PDMergeSort;
     private Sort InPlaceMergeSort;
     private Sort ImprovedInPlaceMergeSort;
@@ -50,13 +51,14 @@ final public class RunMergeSorts extends MultipleSortThread {
 
     public RunMergeSorts(ArrayVisualizer arrayVisualizer) {
         super(arrayVisualizer);
-        this.sortCount = 15;
+        this.sortCount = 16;
         this.categoryCount = this.sortCount;
 
         MergeSort                = new                MergeSort(this.arrayVisualizer);
         BottomUpMergeSort        = new        BottomUpMergeSort(this.arrayVisualizer);
-        NaturalMergeSort         = new         NaturalMergeSort(this.arrayVisualizer);
         PartialMergeSort         = new         PartialMergeSort(this.arrayVisualizer);
+        TwinSort                 = new                 TwinSort(this.arrayVisualizer);
+        NaturalMergeSort         = new         NaturalMergeSort(this.arrayVisualizer);
         PDMergeSort              = new              PDMergeSort(this.arrayVisualizer);
         InPlaceMergeSort         = new         InPlaceMergeSort(this.arrayVisualizer);
         ImprovedInPlaceMergeSort = new ImprovedInPlaceMergeSort(this.arrayVisualizer);
@@ -74,8 +76,9 @@ public RunMergeSorts(ArrayVisualizer arrayVisualizer) {
     protected synchronized void executeSortList(int[] array) throws Exception {
         RunMergeSorts.this.runIndividualSort(MergeSort,                0, array, 2048, 1.5,  false);
         RunMergeSorts.this.runIndividualSort(BottomUpMergeSort,        0, array, 2048, 1.5,  false);
-        RunMergeSorts.this.runIndividualSort(NaturalMergeSort,         0, array, 2048, 1.5,  false);
         RunMergeSorts.this.runIndividualSort(PartialMergeSort,         0, array, 2048, 1.5,  false);
+        RunMergeSorts.this.runIndividualSort(TwinSort,                 0, array, 2048, 1.5,  false);
+        RunMergeSorts.this.runIndividualSort(NaturalMergeSort,         0, array, 2048, 1.5,  false);
         RunMergeSorts.this.runIndividualSort(PDMergeSort,              0, array, 2048, 1,    false);
         RunMergeSorts.this.runIndividualSort(InPlaceMergeSort,         0, array, 2048, 1.5,  false);
         RunMergeSorts.this.runIndividualSort(ImprovedInPlaceMergeSort, 0, array, 2048, 1.5,  false);