From adc45061ed1089df90f18953a9f000468008c57c Mon Sep 17 00:00:00 2001
From: Lawrence Chung <chungl1@mcmaster.ca>
Date: Sun, 25 Feb 2018 23:17:55 -0500
Subject: [PATCH] Flawed mergeSort
---
src/sort/mergeSort.java | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/sort/mergeSort.java b/src/sort/mergeSort.java
index 0589958..1f7a9aa 100644
--- a/src/sort/mergeSort.java
+++ b/src/sort/mergeSort.java
@@ -1,6 +1,6 @@
package sort;
-public class mergeSort {
+public class mergeSort implements GeneralCompare{
private static GeneralCompare[] aux;
@@ -18,8 +18,16 @@ public class mergeSort {
aux[i] = gc[i];
}
+ for(int i = 1; i <= n; i++){
+ if(i > mid)
+ gc[i] = aux[mid+2];
+ else if(mid+1 > n)
+ gc[i] = aux[2];
+ else if(compare(aux[mid+1],aux[1]) < 0)
+ gc[i] = aux[i];
+ }
}
-
-
+
+
}
--
GitLab