From 20a9e048767079cf17a11ebf8977816f20cacc32 Mon Sep 17 00:00:00 2001
From: Lawrence Chung <chungl1@mcmaster.ca>
Date: Mon, 26 Feb 2018 18:13:17 -0500
Subject: [PATCH] mergeSort draft
---
src/sort/mergeSort.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/sort/mergeSort.java b/src/sort/mergeSort.java
index 7816e4e..528aea3 100644
--- a/src/sort/mergeSort.java
+++ b/src/sort/mergeSort.java
@@ -1,12 +1,12 @@
package sort;
-public class mergeSort implements GeneralCompare{
-
- private static GeneralCompare[] aux;
+public class mergeSort{
+
+ private static Comparable[] aux;
- public static void merge(GeneralCompare[] gc, int n){
+ public static void merge(Comparable x, int n, GeneralCompare gc){
- aux = new GeneralCompare[n];
+ aux = new Comparable[n];
if(n <= 1)
return;
@@ -20,13 +20,13 @@ public class mergeSort implements GeneralCompare{
for(int k = 1; k <= n; k++){
if(i > j-1)
- gc[k] = aux[j++];
+ x[k] = aux[j++];
else if(j > n)
- gc[k] = aux[i++];
- else if(compare(aux[j+1],aux[1]) < 0)// ?
- gc[k] = aux[j++];
+ x[k] = aux[i++];
+ else if(gc.compare(aux[j+1],aux[1]) < 0)// ?
+ x[k] = aux[j++];
else
- gc[k] = aux[i++];
+ x[k] = aux[i++];
}
}
--
GitLab