ruby-heap 0.2.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9974abcd60bd8451a0b255d5a92a5662f017643
-  data.tar.gz: 619d3a2efe5beb55f18451dfef513a55deb10255
+  metadata.gz: bc4d7d961145b02d3388febd7dbfbb96eef78302
+  data.tar.gz: 1acbb9e94be684a8a6f04afa112d1662a7aea41c
 SHA512:
-  metadata.gz: 0a49cc38bbdcb3d910ec6a80487bd6ff3fdbc7f9a5171d1a19e50db844702fa31b1320d78ab07f3496d0352c30ffe88f99829f655b01d24fefc57675b5a9e7e5
-  data.tar.gz: 3eb7d687cad878bf3d38bc7e373d21e8d6d132b5fa6604a2254aebc394874c4c48b1c554e2c78d6f590ed63f8e87d925d5022557448b345124f045c7d5311a1a
+  metadata.gz: 5207179c28f8677196aefa822c6a57cfeac7fe1b56e5d25605a4cd119a4d8d34a7a350686362051759e362943c9eb1e5bf5446e94351cec256e5b56d669006d8
+  data.tar.gz: 1b5399aea603ec9f097202686795696909fe2ff7e8f11e1f6310a69b6207afd5340919222b2e6794d37477c2d633a3ad54881484d8939921f2c374e38067ea9d

data/README.md

@@ -1,3 +1,4 @@
+[![Gem Version](https://badge.fury.io/rb/ruby-heap.svg)](https://badge.fury.io/rb/ruby-heap)
 # Heap (ruby heapsort)
 
 Gem is using for making Heaps (binary only for now).
@@ -20,6 +21,8 @@ Or install it yourself as:
 
 ## Usage
 
+### Binary Heaps
+
 #### Binary Heap with min root
 While Heap initialize you can add any comparable object in it (not numbers only).
 Objects must have compare functions (>, >=, <, <=).
@@ -99,6 +102,21 @@ max_heap = Heap::BinaryHeap::MaxHeap.new [9, -1, 4]
 # Merge heaps
 min_heap.add max_heap
 
+min_heap.count    # 6
+min_heap.sort     # [-1, 1, 2, 3, 4, 9]
+```
+
+### Multiple Heaps
+
+Multiple (d-ary) heaps have **same methods as binary**. But initialize differs:
+
+```ruby
+require 'Heap'
+
+# First param is "d" of heap
+# Second param is optional and can contain first elements
+min_heap = Heap::MultipleHeap::MinHeap.new(5, [10, 20, 30])
+max_heap = Heap::MultipleHeap::MaxHeap.new(7)
 ```
 
 ## Development

data/lib/Heap.rb

@@ -3,4 +3,6 @@ require 'Heap/version'
 module Heap
   require 'Heap/binary_heap/binary_heap_min'
   require 'Heap/binary_heap/binary_heap_max'
+  require 'Heap/multiple_heap/multiple_heap_max'
+  require 'Heap/multiple_heap/multiple_heap_min'
 end

data/lib/Heap/binary_heap/binary_heap_max.rb

@@ -55,7 +55,7 @@ module Heap
 
       def swim_up(index)
         return if index == 1
-        parent_index = (index / 2).floor
+        parent_index = index / 2
         return if @elements[parent_index - 1] >= @elements[index - 1]
         swap(parent_index, index)
         swim_up parent_index

data/lib/Heap/binary_heap/binary_heap_min.rb

@@ -55,7 +55,7 @@ module Heap
 
       def swim_up(index)
         return if index == 1
-        parent_index = (index / 2).floor
+        parent_index = index / 2
         return if @elements[parent_index - 1] <= @elements[index - 1]
         swap(parent_index, index)
         swim_up parent_index

data/lib/Heap/multiple_heap/multiple_heap_max.rb

@@ -0,0 +1,82 @@
+module Heap
+  module MultipleHeap
+    class MaxHeap
+      attr_reader :elements
+      attr_reader :d
+
+      def initialize(d, elements = [])
+        @elements = []
+        @d = d
+        add(elements.pop) until elements.empty?
+      end
+
+      def add(element)
+        if element.is_a? Array
+          element.each do |el|
+            @elements.push el
+            swim_up(count)
+          end
+        elsif defined? element.elements
+          add element.elements
+        else
+          @elements.push element
+          swim_up(count)
+        end
+      end
+
+      def count
+        @elements.length
+      end
+
+      def extract_max
+        @elements[0]
+      end
+
+      def extract_max!
+        swap(1, count)
+        el = @elements.pop
+        swim_down(1)
+        el
+      end
+
+      def sort
+        el_temp = @elements.clone
+        result = []
+        result.push extract_max! while count > 0
+        @elements = el_temp
+        result
+      end
+
+      private
+
+      def swap(index1, index2)
+        temp = @elements[index1 - 1]
+        @elements[index1 - 1] = @elements[index2 - 1]
+        @elements[index2 - 1] = temp
+      end
+
+      def swim_up(index)
+        return if index == 1
+        parent_index = ((index.to_f - 1) / @d).ceil
+        return if @elements[parent_index - 1] >= @elements[index - 1]
+        swap(parent_index, index)
+        swim_up parent_index
+      end
+
+      def swim_down(index)
+        child_indexes = []
+        (2..(@d + 1)).each { |i| child_indexes.push((index - 1) * @d + i) }
+        child_indexes.delete_if { |ind| ind > count }
+        return if child_indexes.empty?
+
+        children = {}
+        child_indexes.each { |ind| children[@elements[ind - 1]] = ind }
+        max_child = children.max
+
+        return if @elements[index - 1] >= max_child[0]
+        swap index, max_child[1]
+        swim_down max_child[1]
+      end
+    end
+  end
+end

data/lib/Heap/multiple_heap/multiple_heap_min.rb

@@ -0,0 +1,82 @@
+module Heap
+  module MultipleHeap
+    class MinHeap
+      attr_reader :elements
+      attr_reader :d
+
+      def initialize(d, elements = [])
+        @elements = []
+        @d = d
+        add(elements.pop) until elements.empty?
+      end
+
+      def add(element)
+        if element.is_a? Array
+          element.each do |el|
+            @elements.push el
+            swim_up(count)
+          end
+        elsif defined? element.elements
+          add element.elements
+        else
+          @elements.push element
+          swim_up(count)
+        end
+      end
+
+      def count
+        @elements.length
+      end
+
+      def extract_min
+        @elements[0]
+      end
+
+      def extract_min!
+        swap(1, count)
+        el = @elements.pop
+        swim_down(1)
+        el
+      end
+
+      def sort
+        el_temp = @elements.clone
+        result = []
+        result.push extract_min! while count > 0
+        @elements = el_temp
+        result
+      end
+
+      private
+
+      def swap(index1, index2)
+        temp = @elements[index1 - 1]
+        @elements[index1 - 1] = @elements[index2 - 1]
+        @elements[index2 - 1] = temp
+      end
+
+      def swim_up(index)
+        return if index == 1
+        parent_index = ((index.to_f - 1) / @d).ceil
+        return if @elements[parent_index - 1] <= @elements[index - 1]
+        swap(parent_index, index)
+        swim_up parent_index
+      end
+
+      def swim_down(index)
+        child_indexes = []
+        (2..(@d + 1)).each { |i| child_indexes.push((index - 1) * @d + i) }
+        child_indexes.delete_if { |ind| ind > count }
+        return if child_indexes.empty?
+
+        children = {}
+        child_indexes.each { |ind| children[@elements[ind - 1]] = ind }
+        min_child = children.min
+
+        return if @elements[index - 1] <= min_child[0]
+        swap index, min_child[1]
+        swim_down min_child[1]
+      end
+    end
+  end
+end

data/lib/Heap/version.rb

@@ -1,3 +1,3 @@
 module Heap
-  VERSION = '0.2.2'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-heap
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Alexandr Sysoev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,8 +71,9 @@ files:
 - lib/Heap.rb
 - lib/Heap/binary_heap/binary_heap_max.rb
 - lib/Heap/binary_heap/binary_heap_min.rb
+- lib/Heap/multiple_heap/multiple_heap_max.rb
+- lib/Heap/multiple_heap/multiple_heap_min.rb
 - lib/Heap/version.rb
-- ruby-heap-0.2.1.gem
 homepage: https://github.com/pups3s/ruby-heap
 licenses:
 - MIT