(hybrid) zipsort use single template function

landfillbaby · landfillbaby · commit 6bc05ff75a1f · 2020-06-05T02:11:37.000+01:00
diff --git a/src/sorts/HybridZipSort.java b/src/sorts/HybridZipSort.java
@@ -27,6 +27,6 @@ public HybridZipSort(Delays delayOps, Highlights markOps, Reads readOps, Writes
 
     @Override
     public void runSort(int[] array, int length, int bucketCount) {
-        this.hybridZipSort(array, 0, length, 1, true, false);
+        this.zipSort(array, 0, length, true, 1, true, false);
     }
 }
diff --git a/src/sorts/ZipSort.java b/src/sorts/ZipSort.java
@@ -27,6 +27,6 @@ public ZipSort(Delays delayOps, Highlights markOps, Reads readOps, Writes writeO
 
     @Override
     public void runSort(int[] array, int length, int bucketCount) {
-        this.zipSort(array, 0, length, 1, true, false);
+        this.zipSort(array, 0, length, false, 1, true, false);
     }
 }
diff --git a/src/templates/ZipSorting.java b/src/templates/ZipSorting.java
@@ -116,60 +116,41 @@ protected void zipMerge(int[] arr, int left, int right, int end, double sleep, b
         }
     }
 
-    protected void zipSort(int[] arr, int beg, int end, double sleep, boolean mark, boolean temp) {
+    protected void zipSort(int[] arr, int beg, int end, boolean hybrid, double sleep, boolean mark, boolean temp) {
+        insertSorter = new InsertionSort(this.Delays, this.Highlights, this.Reads, this.Writes);
         int sze = end - beg;
         if(sze <= 1)
             return;
 
-        //go through all of the lengths starting at 2 doubling
         int len = 1;
-        while(len < sze) {
-            int pos = 0;
-            //go through all of the sorted sublists, zip them together
-            while(pos + len < sze) {
-                //make the two halves
-                int cleft = beg + pos;
-                int cright = cleft + len;
-                int cend = cleft + (len * 2);
-                if(pos + (len * 2) > sze) cend = end;
 
-                //do zip merge
-                zipMerge(arr, cleft, cright, cend, sleep, mark, temp);
-                pos += (len * 2);
+        if(hybrid){
+            //sort small runs with insertion sort before doing merge
+            int insert_count = 16;
+            {
+                int len = insert_count;
+                int count = 0;
+                for(int bg = beg; bg != end; count+=len) {
+                    int ed = (count + len > sze ? end : bg + len);
+                    insertSorter.customInsertSort(arr, bg, ed, sleep, temp);
+                    bg = ed;
+                }
             }
-            len *= 2;
-        }
-    }
+            if(sze <= insert_count)
+                return;
 
-    protected void hybridZipSort(int[] arr, int beg, int end, double sleep, boolean mark, boolean temp) {
-        insertSorter = new InsertionSort(this.Delays, this.Highlights, this.Reads, this.Writes);
-        int sze = end - beg;
-        if(sze <= 1)
-            return;
-        //sort small runs with insertion sort before doing merge
-        int insert_count = 16;
-        {
-            int len = insert_count;
-            int count = 0;
-            for(int bg = beg; bg != end; count+=len) {
-                int ed = (count + len > sze ? end : bg + len);
-                insertSorter.customInsertSort(arr, bg, ed, sleep, temp);
-                bg = ed;
-            }
+            len = insert_count;
         }
-        if(sze <= insert_count)
-            return;
 
         //go through all of the lengths starting at 1 doubling
-        int len = insert_count;
         while(len < sze) {
             int pos = 0;
             //go through all of the sorted sublists, zip them together
             while(pos + len < sze) {
                 //make the two halves
                 int cleft = beg + pos;
                 int cright = cleft + len;
-                int cend = (pos + (len * 2) > sze ? end : cleft + (len * 2));
+                int cend = (pos + (len * 2) > sze ? end : cright + len);
 
                 //do zip merge
                 zipMerge(arr, cleft, cright, cend, sleep, mark, temp);

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@ public HybridZipSort(Delays delayOps, Highlights markOps, Reads readOps, Writes`
`27`	`27`
`28`	`28`	`@Override`
`29`	`29`	`public void runSort(int[] array, int length, int bucketCount) {`
`30`		`- this.hybridZipSort(array, 0, length, 1, true, false);`
	`30`	`+ this.zipSort(array, 0, length, true, 1, true, false);`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@ public ZipSort(Delays delayOps, Highlights markOps, Reads readOps, Writes writeO`
`27`	`27`
`28`	`28`	`@Override`
`29`	`29`	`public void runSort(int[] array, int length, int bucketCount) {`
`30`		`- this.zipSort(array, 0, length, 1, true, false);`
	`30`	`+ this.zipSort(array, 0, length, false, 1, true, false);`
`31`	`31`	`}`
`32`	`32`	`}`