data_structures_101 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58e7223d936a7a93cd7869b832d1dca06a070471eadbad905eae42fb5f2ce3ec
-  data.tar.gz: fc0679cc03d811202d4cce7bc66699e5e0c0351bb1f50e1040dd62665a4ba7bd
+  metadata.gz: 7b165126a0a9d3d817393b985bbf32648adeebd9984ad51e82235859b38f19db
+  data.tar.gz: cb9311135096e0cbe4912cec09fae930b513f49044ad1e964c48e2f312f63581
 SHA512:
-  metadata.gz: 8737d83179843fcaacbc108361ac971e464b6744d5043f776fc0c91c69c5224a79bb33596092e219fb76d9a91bf3a9e16f67ad29e049cd5ed3ee59fd256d9c0e
-  data.tar.gz: cb95b2358f02b3ec1fdcbe8640ba5f6be6446bc0df8460389b925783340dec51337da89dfad93e6c184fbeac13d562526d0d4ef527449b7c3ff1e014e18d3090
+  metadata.gz: 20288907bd1bc5ebde1eb98d6cd384b2a1a363b570988bc6ab81530406d7ec9a88a5e9931079d1f362bda7ab8381f5dda7781bf84883640f32e1f63532995709
+  data.tar.gz: 70895ffddb44aa604877bb910d97657b47c501de791239ed0c663e7c8812278b5f761476e521ca8f7defca7ee3c6eaf047e5f4debf5bff9849b6e0faf3d10ee6

data/lib/data_structures_101/heap.rb

@@ -6,11 +6,14 @@ module DataStructures101
   # @since 0.3
   class Heap
 
+    attr_reader :min_heap
+
     def initialize(*args, min_heap: false)
       @data = args
+      @min_heap = min_heap
       @heap_check = ->(i, j) { return @data[i] >= @data[j] }
 
-      if min_heap
+      if @min_heap
         @heap_check = ->(i, j) { return @data[i] <= @data[j] }
       end
 
@@ -25,6 +28,27 @@ module DataStructures101
       @data[i]
     end
 
+    def push(*values)
+      values.each do |val|
+        @data.push(val)
+        upheap(@data.size - 1)
+      end
+      self
+    end
+
+    def pop
+      result = @data.first
+      @data[0] = @data.pop
+      heapify(0)
+      result
+    end
+
+    def merge(heap)
+      new_array = @data + heap.instance_variable_get(:@data)
+
+      Heap.new(new_array, min_heap: self.min_heap)
+    end
+    
     def left(i)
       2 * i + 1
     end
@@ -40,7 +64,7 @@ module DataStructures101
     private
 
     def build_heap
-      start = @data.length / 2
+      start = @data.size / 2
 
       start.downto(0) { |i| heapify(i) }
     end
@@ -58,5 +82,15 @@ module DataStructures101
         heapify(head)
       end
     end
+
+    def upheap(idx)
+      p = parent(idx)
+
+      if @heap_check.call(idx, p)
+        @data[idx], @data[p] = @data[p], @data[idx]
+        upheap(p)
+      end
+    end
+
   end
 end

data/lib/data_structures_101/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DataStructures101
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_structures_101
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - renehernandez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler