Merge pull request #76 from aphitorite/621

MusicTheorist · web-flow · commit a87fba69dd58 · 2020-08-24T17:57:18.000-04:00
std::stable_sort fix
diff --git a/src/sorts/BottomUpMergeSort.java b/src/sorts/BottomUpMergeSort.java
@@ -120,10 +120,12 @@ private void stableSort (int[] a, int n) {
           // Sort a[0:n-1] using merge sort.
           int   s = 16;      // segment size
           int[] b = new int [n];
+		  int i;
           
-          for(int i = 0; i <= n - 16; i += 16) {
+          for(i = 0; i <= n - 16; i += 16) {
               binaryInserter.customBinaryInsert(a, i, i + 16, 0.35);
           }
+		  binaryInserter.customBinaryInsert(a, i, n, 0.35);
           
           while (s < n)
           {

Original file line number	Diff line number	Diff line change
`@@ -120,10 +120,12 @@ private void stableSort (int[] a, int n) {`
`120`	`120`	`// Sort a[0:n-1] using merge sort.`
`121`	`121`	`int s = 16; // segment size`
`122`	`122`	`int[] b = new int [n];`
	`123`	`+ int i;`
`123`	`124`
`124`		`- for(int i = 0; i <= n - 16; i += 16) {`
	`125`	`+ for(i = 0; i <= n - 16; i += 16) {`
`125`	`126`	`binaryInserter.customBinaryInsert(a, i, i + 16, 0.35);`
`126`	`127`	`}`
	`128`	`+ binaryInserter.customBinaryInsert(a, i, n, 0.35);`
`127`	`129`
`128`	`130`	`while (s < n)`
`129`	`131`	`{`