Skip to content
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.

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

Faiza #21

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 17 additions & 5 deletions lib/heap_sort.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@

require_relative './min_heap';

# This method uses a heap to sort an array.
# Time Complexity: ?
# Space Complexity: ?
def heap_sort(list)
raise NotImplementedError, "Method not implemented yet..."
# Time Complexity: O(n), where n is the number of nodes
# Space Complexity: O(1)
def heapsort(list)
return list if list.empty? || list.length == 1

minHeap = MinHeap.new()

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a note that coding style for minHeap should be min_heap


until list.empty?
minHeap.add(list.pop)
end

until minHeap.empty?
list << minHeap.remove
end

return list
end
65 changes: 50 additions & 15 deletions lib/min_heap.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,23 @@ def initialize
end

# This method adds a HeapNode instance to the heap
# Time Complexity: ?
# Space Complexity: ?
# Time Complexity: O(log n), where n is the number of nodes (at worst there might need to a be a swap at every level)
# Space Complexity: O(1)
def add(key, value = key)
raise NotImplementedError, "Method not implemented yet..."
heap_node = HeapNode.new(key, value)
@store.push(heap_node)
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), where n is the number of nodes (at worst there might need to a be a swap at every level)
# Space Complexity: O(1)
def remove()
raise NotImplementedError, "Method not implemented yet..."
swap(0, @store.length - 1)
removed_node = @store.pop
heap_down(0)
return removed_node.value

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Getting a NoMethodError here in the "can sort a 5-element array" test.

end


Expand All @@ -39,33 +44,63 @@ def to_s
end

output += @store.last.value + "]"

return output
end

# This method returns true if the heap is empty
# Time complexity: ?
# Space complexity: ?
# Time complexity: O(n)
# Space complexity: O(1)
def empty?
raise NotImplementedError, "Method not implemented yet..."
if @store.empty?
return
end
Comment on lines +55 to +57

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're returning nil if @store.empty? I would instead return @store.empty?

end

private

# 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(n) where n is the number of nodes
# Space complexity: O(1)
def heap_up(index)

parent_index = (index - 1) / 2

if parent_index >= 0
if @store[parent_index].key > @store[index].key
swap(parent_index, index)
heap_up(parent_index)
end
end
return
end

# This helper method takes an index and
# 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_child = (index * 2) + 1
right_child = (index * 2) + 2

if @store[left_child].nil?
return
end

if @store[right_child].nil?
if @store[left_child].key < @store[index].key
swap(index, left_child)
end
return
end

if @store[left_child].key < @store[right_child].key
swap(index, left_child)
heap_down(left_child)
else
swap(index, right_child)
heap_down(right_child)
end
end

# If you want a swap method... you're welcome
Expand Down
12 changes: 6 additions & 6 deletions test/heapsort_test.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
require_relative "test_helper"

xdescribe "heapsort" do
describe "heapsort" do
it "sorts an empty array" do
# Arrange
# Arrange
list = []

# Act
Expand All @@ -13,7 +13,7 @@
end

it "can sort a 1-element array" do
# Arrange
# Arrange
list = [5]

# Act
Expand All @@ -22,15 +22,15 @@
# Assert
expect(result).must_equal [5]
end

it "can sort a 5-element array" do
# Arrange
# Arrange
list = [5, 27, 3, 16, -50]

# Act
result = heapsort(list)

# Assert
expect(result).must_equal [-50, 3, 5, 16, 27]
end
end
end