Algorithms/JavaAlgorithms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update HeapSort.java

Browse Source
This commit is contained in:
Shyam Thiagarajan 2016-10-08 13:42:37 -04:00 committed by GitHub
parent b8e0e82c12
commit 6f51755256
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
HeapSort.java
View File

@ -68,25 +68,25 @@ public class HeapSort {
* index of last child * index of last child
*/ */
private void heapSubtree(int rootIndex, int lastChild) { private void heapSubtree(int rootIndex, int lastChild) {
int leftIndex = rootIndex * 2 + 1; // calculate index of left children int leftIndex = rootIndex * 2 + 1;
int rightIndex = rootIndex * 2 + 2; int rightIndex = rootIndex * 2 + 2;
boolean hasLeftChild = leftIndex <= lastChild; boolean hasLeftChild = leftIndex <= lastChild;
boolean hasRightChild = rightIndex <= lastChild; boolean hasRightChild = rightIndex <= lastChild;
int root = this.heap[rootIndex]; int root = this.heap[rootIndex];
if (hasRightChild) { if (hasRightChild) {
int left = this.heap[leftIndex]; // get left child int left = this.heap[leftIndex];
int right = this.heap[rightIndex]; // get right child int right = this.heap[rightIndex];
if (left < right && left < root) { if (left < right && left < root) {
this.swap(leftIndex, rootIndex); //swap left with root this.swap(leftIndex, rootIndex);
this.heapSubtree(leftIndex, lastChild); this.heapSubtree(leftIndex, lastChild);
} else if (right < root) { } else if (right < root) {
this.swap(rightIndex, rootIndex); //swap right with root this.swap(rightIndex, rootIndex);
this.heapSubtree(rightIndex, lastChild); this.heapSubtree(rightIndex, lastChild);
} }
} else if (hasLeftChild) { // if no right, but has left } else if (hasLeftChild) { // if no right, but has left
int left = this.heap[leftIndex]; int left = this.heap[leftIndex];
if (left < root) { if (left < root) {
this.swap(leftIndex, rootIndex); //swap left and root this.swap(leftIndex, rootIndex);
this.heapSubtree(leftIndex, lastChild); this.heapSubtree(leftIndex, lastChild);
} }
} }
@ -99,8 +99,8 @@ public class HeapSort {
* index of root of heap * index of root of heap
*/ */
private void makeMinHeap(int root) { private void makeMinHeap(int root) {
int leftIndex = root * 2 + 1; // calculate index of left child int leftIndex = root * 2 + 1;
int rightIndex = root * 2 + 2; // calculate index of left child int rightIndex = root * 2 + 2;
boolean hasLeftChild = leftIndex < this.heap.length; boolean hasLeftChild = leftIndex < this.heap.length;
boolean hasRightChild = rightIndex < this.heap.length; boolean hasRightChild = rightIndex < this.heap.length;
if (hasRightChild) { //if has left and right if (hasRightChild) { //if has left and right