ruby-heap 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81514e6e431e57dad5a43540277e8d84a7b25df4
-  data.tar.gz: 6ed5ed8d1cc587f884238472e00e73596acc2afb
+  metadata.gz: e6ecc83dcd850b3ac2c03e244912f8095f1539be
+  data.tar.gz: 68194b5303313d8b1582660ed131a5bcf4bc2daf
 SHA512:
-  metadata.gz: 95450d6ead205907ec28748d29fa2175273a616de38d48bca30d6ada6eedb61024c9893349b9318a73945bbf6d4b829c84fc00ad23dca0215b68ea71373e313e
-  data.tar.gz: 9a03daf237471d5a954126335c6039db118cfa87ad690f12dd4068556d981bf8cfb20f3e624a0b9ef39a01d168119d09ede11585fa801cd729767e56693f246d
+  metadata.gz: 0360ab2168bb8f0cebe0479995f6899f939452907a1e843de951c25fc0083137d7b57395a102e2d18c0de1ca1457ac3ce77ba4a13c037e4cd3961adb9fd1082d
+  data.tar.gz: 77da29a17c374797136933b9a8a8e8ae8e53a443467464b9a3207ed4ce088b620009e5a163fff9d53e9c561e6fe335a77f2876dcc726d6086c07f4c57db3e175

data/lib/Heap.rb

@@ -2,6 +2,7 @@ require 'Heap/version'
 
 # Main ruby-heap rb file
 module Heap
+  require 'Heap/heap_template'
   require 'Heap/binary_heap/binary_heap'
   require 'Heap/binary_heap/binary_heap_min'
   require 'Heap/binary_heap/binary_heap_max'

data/lib/Heap/binary_heap/binary_heap.rb

@@ -1,40 +1,15 @@
 module Heap
   module BinaryHeap
     # Binary Heap template
-    class BinaryHeap
-      attr_reader :elements
+    class BinaryHeap < HeapTemplate
+
+      protected
 
       def initialize(elements = [])
         @elements = []
         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
-
-      protected
-
-      def swap(index1, index2)
-        temp = @elements[index1 - 1]
-        @elements[index1 - 1] = @elements[index2 - 1]
-        @elements[index2 - 1] = temp
-      end
-
       def get_children(index)
         child1 = 2 * index
         child2 = 2 * index + 1

data/lib/Heap/binary_heap/binary_heap_max.rb

@@ -3,22 +3,11 @@ module Heap
     # Binary Heap with max root
     class MaxHeap < BinaryHeap
       def extract_max
-        @elements[0]
+        extract_root
       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
+        extract_root!
       end
 
       private

data/lib/Heap/binary_heap/binary_heap_min.rb

@@ -3,22 +3,11 @@ module Heap
     # Binary Heap with min root
     class MinHeap < BinaryHeap
       def extract_min
-        @elements[0]
+        extract_root
       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
+        extract_root!
       end
 
       private

data/lib/Heap/heap_template.rb

@@ -0,0 +1,51 @@
+module Heap
+  # Heap Template
+  class HeapTemplate
+    attr_reader :elements
+
+    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 sort
+      el_temp = @elements.clone
+      result = []
+      result.push extract_root! while count > 0
+      @elements = el_temp
+      result
+    end
+
+    protected
+
+    def extract_root
+      @elements[0]
+    end
+
+    def extract_root!
+      swap(1, count)
+      el = @elements.pop
+      swim_down(1)
+      el
+    end
+
+    def swap(index1, index2)
+      temp = @elements[index1 - 1]
+      @elements[index1 - 1] = @elements[index2 - 1]
+      @elements[index2 - 1] = temp
+    end
+  end
+end

data/lib/Heap/multiple_heap/multiple_heap.rb

@@ -1,42 +1,17 @@
 module Heap
   module MultipleHeap
     # Multiple Heap template
-    class MultipleHeap
-      attr_reader :elements
+    class MultipleHeap < HeapTemplate
       attr_reader :d
 
+      protected
+
       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
-
-      protected
-
-      def swap(index1, index2)
-        temp = @elements[index1 - 1]
-        @elements[index1 - 1] = @elements[index2 - 1]
-        @elements[index2 - 1] = temp
-      end
-
       def get_children(index)
         child_indexes = []
         (2..(@d + 1)).each { |i| child_indexes.push((index - 1) * @d + i) }

data/lib/Heap/multiple_heap/multiple_heap_max.rb

@@ -3,22 +3,11 @@ module Heap
     # Multiple Heap with max root
     class MaxHeap < MultipleHeap
       def extract_max
-        @elements[0]
+        extract_root
       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
+        extract_root!
       end
 
       private

data/lib/Heap/multiple_heap/multiple_heap_min.rb

@@ -3,22 +3,11 @@ module Heap
     # Multiple Heap with min root
     class MinHeap < MultipleHeap
       def extract_min
-        @elements[0]
+        extract_root
       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
+        extract_root!
       end
 
       private

data/lib/Heap/version.rb

@@ -1,3 +1,3 @@
 module Heap
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-heap
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Alexandr Sysoev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,7 @@ files:
 - lib/Heap/binary_heap/binary_heap.rb
 - lib/Heap/binary_heap/binary_heap_max.rb
 - lib/Heap/binary_heap/binary_heap_min.rb
+- lib/Heap/heap_template.rb
 - lib/Heap/multiple_heap/multiple_heap.rb
 - lib/Heap/multiple_heap/multiple_heap_max.rb
 - lib/Heap/multiple_heap/multiple_heap_min.rb