From 79b8f481db7f83c225d97be8c85a772dcb0d43a4 Mon Sep 17 00:00:00 2001
From: India Kato <india.kato@gmail.com>
Date: Thu, 29 Jul 2021 15:45:47 -0700
Subject: [PATCH] Methods implemented with one test failing

---
 lib/heap_sort.rb      | 20 +++++++++++++---
 lib/min_heap.rb       | 54 ++++++++++++++++++++++++++++++++-----------
 test/heapsort_test.rb |  8 +++----
 3 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/lib/heap_sort.rb b/lib/heap_sort.rb
index c8a32a4..896ff59 100644
--- a/lib/heap_sort.rb
+++ b/lib/heap_sort.rb
@@ -1,8 +1,22 @@
 
 
 # This method uses a heap to sort an array.
-# Time Complexity:  ?
-# Space Complexity: ?
+# Time Complexity:  O(n log n)
+# Space Complexity: O(n)
 def heap_sort(list)
-  raise NotImplementedError, "Method not implemented yet..."
+  return list if list.empty?
+  heap = MinHeap.new  # create a min heap
+
+  list.each do |element|
+    heap.add(element)
+  end
+
+  sorted = []
+  i = 0
+  while i < list.length
+    sorted << heap.remove
+    i += 1
+  end
+
+  return sorted
 end
\ No newline at end of file
diff --git a/lib/min_heap.rb b/lib/min_heap.rb
index 6eaa630..2df563b 100644
--- a/lib/min_heap.rb
+++ b/lib/min_heap.rb
@@ -14,18 +14,28 @@ def initialize
   end
 
   # This method adds a HeapNode instance to the heap
-  # Time Complexity: ?
-  # Space Complexity: ?
+  # Time Complexity: O(log n)
+  # Space Complexity: O(log n) - n
   def add(key, value = key)
-    raise NotImplementedError, "Method not implemented yet..."
+    @store << HeapNode.new(key, value)
+
+    heap_up(@store.length - 1)
   end
 
   # This method removes and returns an element from the heap
   #   maintaining the heap structure
-  # Time Complexity: ?
-  # Space Complexity: ?
+  # Time Complexity: O(log n)
+  # Space Complexity: O(log n)
   def remove()
-    raise NotImplementedError, "Method not implemented yet..."
+    return nil if @store.empty?
+    swap(0, @store.length - 1)
+    result = @store.pop.value
+
+    unless @store.empty?
+      heap_down(0)
+    end
+
+    return result
   end
 
 
@@ -44,10 +54,10 @@ def to_s
   end
 
   # This method returns true if the heap is empty
-  # Time complexity: ?
-  # Space complexity: ?
+  # Time complexity: O(1)
+  # Space complexity: O(1)
   def empty?
-    raise NotImplementedError, "Method not implemented yet..."
+    return @store.empty?
   end
 
   private
@@ -55,17 +65,35 @@ def empty?
   # This helper method takes an index and
   #  moves it up the heap, if it is less than it's parent node.
   #  It could be **very** helpful for the add method.
-  # Time complexity: ?
-  # Space complexity: ?
+  # Time complexity: O(log n)
+  # Space complexity: O(log n)
   def heap_up(index)
-    
+    head = (index - 1) / 2
+
+    if index <= 0 || @store[head].key <= @store[index].key
+      return
+    elsif @store[index].key < @store[head].key
+      swap(head, index)
+      heap_up(head)
+    end
   end
 
   # This helper method takes an index and 
   #  moves it up the heap if it's smaller
   #  than it's parent node.
   def heap_down(index)
-    raise NotImplementedError, "Method not implemented yet..."
+    left = (index * 2) + 1
+    right = (index * 2) + 2
+
+    return if left >= @store.length - 1
+
+    if @store[right].key < @store[left].key && @store[right].key < @store[index].key
+      swap(right, index)
+      heap_down(right)
+    elsif @store[left].key < @store[index].key
+      swap(left, index)
+      heap_down(left)
+    end
   end
 
   # If you want a swap method... you're welcome
diff --git a/test/heapsort_test.rb b/test/heapsort_test.rb
index 34402ac..271e711 100644
--- a/test/heapsort_test.rb
+++ b/test/heapsort_test.rb
@@ -1,12 +1,12 @@
 require_relative "test_helper"
 
-xdescribe "heapsort" do
+describe "heapsort" do
   it "sorts an empty array" do
     # Arrange 
     list = []
 
     # Act
-    result = heapsort(list)
+    result = heap_sort(list)
 
     # Assert
     expect(result).must_equal []
@@ -17,7 +17,7 @@
     list = [5]
 
     # Act
-    result = heapsort(list)
+    result = heap_sort(list)
 
     # Assert
     expect(result).must_equal [5]
@@ -28,7 +28,7 @@
     list = [5, 27, 3, 16, -50]
 
     # Act
-    result = heapsort(list)
+    result = heap_sort(list)
 
     # Assert
     expect(result).must_equal [-50, 3, 5, 16, 27]