Skip to content

Reordered sortHeap method #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
patel-nikhil wants to merge 2 commits into
base: modified
Choose a base branch
from
Open

Reordered sortHeap method #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc2b524
Reordered sortHeap method
patel-nikhil Jan 26, 2020
1397f42
Comment change only
patel-nikhil Jan 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions HeapSort.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,25 @@
*
*/
public class Heap {

/**
* heap sort (case-insensitive)
* @param x array of subjects
* @param y associated array
* @param n problem size
*/
public static void sortHeap (String[] x, String[] y, int n ) {
public static void sortHeap (String[] x, Integer[] y, int n ) {
this.construct(x,y,n);
this.sort(x,y,n);
}

/**
* heap sort (case-insensitive)
* @param x array of subjects
* @param y associated array
* @param n problem size
*/
public static void sortHeap (String[] x, Integer[] y, int n ) {
public static void sortHeap (String[] x, String[] y, int n ) {
this.construct(x,y,n);
this.sort(x,y,n);
}
Expand Down Expand Up @@ -122,12 +123,6 @@ private static void sort(String[] x, String[] y, int n){
}
}

/**
* Performs sortdown of a max-oriented heap to produce a sorted array
* @param x input array organized as max-oriented heap
* @param y associated array
* @param n size of input array
*/
private static void sort(String[] x, Integer[] y, int n){

int end = n - 1;
Expand All @@ -137,7 +132,6 @@ private static void sort(String[] x, Integer[] y, int n){

exchange(x, y, 0, end);

//fix heap order by checking root node with child nodes and switching where necessary
int i = 0;
while (2*i+1 < end && 2*i+2 < end && ((lower(x[2*i+1]).compareTo(lower(x[i])) > 0) || (lower(x[2*i+2]).compareTo(lower(x[i])) > 0))){
//If at least one of the children is non-null and bigger
Expand Down