remove Heap#peek; add Heap#size and #count alias

Author: rickhull

examples/heap.rb

@@ -13,28 +13,28 @@
 h = Heap.new(child_slots: 3)
 
 puts "push: %s" % Array.new(30) { rand(99).tap { |i| h.push i } }.join(' ')
-puts "array: #{h.array.inspect}"
+puts "array: #{h.tree.array.inspect}"
 puts "heap: #{h.heap?}"
 puts h
 puts
 puts
 
 puts "pop: %i" % h.pop
-puts "array: #{h.array.inspect}"
+puts "array: #{h.tree.array.inspect}"
 puts "heap: #{h.heap?}"
 puts h
 puts
 puts
 
 puts "pop: %s" % Array.new(9) { h.pop }.join(' ')
-puts "array: #{h.array.inspect}"
+puts "array: #{h.tree.array.inspect}"
 puts "heap: #{h.heap?}"
 puts h
 puts
 puts
 
 puts "push: %s" % Array.new(30) { rand(99).tap { |i| h.push i } }.join(' ')
-puts "array: #{h.array.inspect}"
+puts "array: #{h.tree.array.inspect}"
 puts "heap: #{h.heap?}"
 puts h
 puts
@@ -51,28 +51,28 @@
 h = Heap.new(child_slots: 2)
 
 puts "push: %s" % Array.new(30) { rand(99).tap { |i| h.push i } }.join(' ')
-puts "array: #{h.array.inspect}"
+puts "array: #{h.tree.array.inspect}"
 puts "heap: #{h.heap?}"
 puts h
 puts
 puts
 
 puts "pop: %i" % h.pop
-puts "array: #{h.array.inspect}"
+puts "array: #{h.tree.array.inspect}"
 puts "heap: #{h.heap?}"
 puts h
 puts
 puts
 
 puts "pop: %s" % Array.new(9) { h.pop }.join(' ')
-puts "array: #{h.array.inspect}"
+puts "array: #{h.tree.array.inspect}"
 puts "heap: #{h.heap?}"
 puts h
 puts
 puts
 
 puts "push: %s" % Array.new(30) { rand(99).tap { |i| h.push i } }.join(' ')
-puts "array: #{h.array.inspect}"
+puts "array: #{h.tree.array.inspect}"
 puts "heap: #{h.heap?}"
 puts h
 puts

lib/compsci/heap.rb

@@ -56,12 +56,6 @@ def pop
       node
     end
 
-    # * return what pop would return (avoid sifting)
-    #
-    def peek
-      @tree.first
-    end
-
     # * called recursively
     # * idx represents the node suspected to violate the heap
     # * intended to be O(log n) on heap size (log base child_slots)
@@ -125,5 +119,10 @@ def heap?(idx: 0)
       check_children.each { |cidx| return false unless self.heap?(idx: cidx) }
       true
     end
+
+    def size
+      @tree.size
+    end
+    alias_method :count, :size
   end
 end

test/heap.rb

@@ -32,7 +32,7 @@
 
     it "must pop" do
       expect(@maxheap.pop).must_equal 10
-      expect(@maxheap.peek).wont_equal 10
+      expect(@maxheap.tree.last).wont_equal 10
       expect(@maxheap.heap?).must_equal true
     end
 
@@ -74,7 +74,7 @@
 
     it "must pop" do
       expect(@minheap.pop).must_equal 1
-      expect(@minheap.peek).wont_equal 1
+      expect(@minheap.tree.last).wont_equal 1
       expect(@minheap.heap?).must_equal true
     end
 
@@ -117,7 +117,7 @@
 
     it "must pop" do
       expect(@heap3.pop).must_equal 10
-      expect(@heap3.peek).wont_equal 10
+      expect(@heap3.tree.last).wont_equal 10
       expect(@heap3.heap?).must_equal true
     end