Skip to content
Snippets Groups Projects
Commit 27037ed2 authored by Lawrence Chung's avatar Lawrence Chung
Browse files

Merge branch 'TeamB' of https://gitlab.cas.mcmaster.ca/schankuc/2XB3 into TeamB

parents 67f937b1 7ccfceca
No related branches found
No related tags found
No related merge requests found
......@@ -29,9 +29,9 @@ public class MergeSort{
/**
* Recursively sort each half of a sub-array
* @param lo
* @param hi
* @param gc
* @param lo Lower bound of a sub-array to be sorted
* @param hi Upper bound of a sub-array to be sorted
* @param gc A lambda function that compares two comparable items
* @param aux Auxiliary array to accommodate temporary memory use in the algorithm
*/
private static <T> void sortWrapped(Comparable<T>[] x, int lo, int hi, GeneralCompare<T> gc, Comparable<T>[] aux) {
......@@ -47,11 +47,11 @@ public class MergeSort{
/**
* Merges two sorted sub-arrays into a single sorted array
* @param x
* @param lo
* @param hi
* @param gc
* @param aux
* @param x Array of comparable items to be sorted
* @param lo Lower bound of a sub-array to be sorted
* @param hi Upper bound of a sub-array to be sorted
* @param gc A lambda function that compares two comparable items
* @param aux Auxiliary array to accommodate temporary memory use in the algorithm
*/
private static <T> void merge(Comparable<T>[] x, int lo, int hi, GeneralCompare<T> gc, Comparable<T>[] aux){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment