darecoder
diff --git a/‎.idea/workspace.xml
Lines changed: 11 additions & 42 deletions b/‎.idea/workspace.xml
Lines changed: 11 additions & 42 deletions
diff --git a/‎out/production/Crux/com/company/Lecture19/Heap.class
193 Bytes b/‎out/production/Crux/com/company/Lecture19/Heap.class
193 Bytes
diff --git a/‎out/production/Crux/com/company/Lecture19/HeapClient.class
33 Bytes b/‎out/production/Crux/com/company/Lecture19/HeapClient.class
33 Bytes
diff --git a/‎out/production/Crux/com/company/Lecture4/Swastik.class
0 Bytes b/‎out/production/Crux/com/company/Lecture4/Swastik.class
0 Bytes
diff --git a/‎src/com/company/Lecture19/Heap.java
Lines changed: 19 additions & 20 deletions b/‎src/com/company/Lecture19/Heap.java
Lines changed: 19 additions & 20 deletions
diff --git a/‎src/com/company/Lecture19/HeapClient.java
Lines changed: 3 additions & 1 deletion b/‎src/com/company/Lecture19/HeapClient.java
Lines changed: 3 additions & 1 deletion
@@ -19,57 +19,56 @@ private int parent(int index){
 
     public void add(T value){
         list.add(value);
-
-        upheap(list.size() - 1);
+        upHeap(list.size() - 1);
     }
 
-    private void upheap(int index){
+    private void upHeap(int index){
         if(index == 0){
             return;
         }
-
         int parent = parent(index);
-
         if(list.get(parent).compareTo(list.get(index)) <= 0){
             return;
         }
-
         T temp = list.get(index);
         list.set(index,list.get(parent));
         list.set(parent,temp);
-
-        upheap(parent);
+        upHeap(parent);
     }
 
-    private void downheap(int index){
+    private void downHeap(int index){
         int min = index;
-
         int left = left(index);
         int right = right(index);
-
         if(left < list.size() && list.get(left).compareTo(list.get(min)) < 0){
             min = left;
         }
-
         if(right < list.size() && list.get(right).compareTo(list.get(min)) < 0 ){
             min = right;
         }
-
-        if(index != min){
+        if(min != index){
             T temp = list.get(index);
             list.set(index,list.get(min));
             list.set(min,temp);
+            downHeap(min);
         }
     }
 
     public T remove(){
-        T value = list.get(0);
-
-        if(list.size() > 1){
-            list.set(0,list.remove(list.size()-1));
-            downheap(0);
+        if (list.isEmpty()) {
+            return null;
         }
-
+        if (list.size() == 1) {
+            return list.remove(0);
+        }
+        T value = list.get(0);
+        list.set(0,list.remove(list.size()-1));
+        downHeap(0);
         return value;
     }
+
+    @Override
+    public String toString() {
+        return list.toString();
+    }
 }
@@ -2,7 +2,7 @@
 
 public class HeapClient {
     public static void main(String[] args) {
-        Heap<Integer> heap = new Heap<Integer>();
+        Heap<Integer> heap = new Heap<>();
 
         heap.add(4);
         heap.add(8);
@@ -11,7 +11,9 @@ public static void main(String[] args) {
 
         System.out.println(heap.remove());
         System.out.println(heap.remove());
+        System.out.println(heap);
         System.out.println(heap.remove());
         System.out.println(heap.remove());
+        System.out.println(heap);
     }
 }