ruby_structures 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f90580fdf848a8b70513b2756ea932be5913ca0
-  data.tar.gz: 0bdf1a300665bfa031045f07ab5a01a9b4e17f34
+  metadata.gz: 17721c0cc0021cc392b05b4aa49d15832241a259
+  data.tar.gz: 970e93098011e762e426c10063ddb3d827588575
 SHA512:
-  metadata.gz: c9b4072b567a40780c949177e91bf4a26b92af651038e2eb1d39ac04ac3adb88bf0d37bb4bcf7e88f379fa8b72d6893912234c5615b6f5da1b74a1ac7cb330b3
-  data.tar.gz: fbac1d228a0a991f05506bbbca51177582c97612289e82015bd941dd67c9d258feab5fcb2c491c95756edf22ec608238d9d074094385af363e19000ebff4b6c1
+  metadata.gz: 34c672dd7800d5f384e642213075776adbf203dbd9c365b8bfdd7b7dac50e28c0f11edb6ad9ec5eec2e7f23d6758b0532a14dfd9cf663424a0d15e767d51c2e4
+  data.tar.gz: c78d182ee08c21f9d5d328d549bb2a5bb073b9f4a94fdcec4013686f5d41d5d9566c529290e9a457452e644ea465e3d457d5f16a8f10be0e83512a2423901f38

data/lib/data_structures/binary_tree.rb

@@ -26,12 +26,22 @@ class BinaryTree
     @leaves = []
   end
 
-  def depth_first_search(target=nil, &prc)
+  def depth_first_search(target=nil, start_node=nil, &prc)
     raise ArgumentError.new('Must pass either a target value or a block') unless (target || prc) && !(target && prc)
     prc ||= Proc.new { |node| node.send(:val) == target }
 
     return nil if @head.nil?
-    @head.send(:depth_first_search, &prc)
+    start_node ||= @head
+
+    return start_node if prc.call(start_node)
+
+    [start_node.send(:left_child), start_node.send(:right_child)].each do |child|
+      next if child.nil?
+      result = depth_first_search(nil, child, &prc)
+      return result unless result.nil?
+    end
+
+    nil
   end
 
   def breadth_first_search(target=nil, &prc)
@@ -73,17 +83,5 @@ class BinaryTreeNode
 
   private
 
-  def depth_first_search(&prc)
-    return self if prc.call(self)
-
-    [@left_child, @right_child].each do |child|
-      next if child.nil?
-      result = child.send(:depth_first_search, &prc)
-      return result unless result.nil?
-    end
-
-    nil
-  end
-
   attr_accessor :val, :parent, :left_child, :right_child
 end

data/lib/data_structures/heap.rb

@@ -1,10 +1,38 @@
 class Heap
+  def self.from_array(array)
+    heap = Heap.new
+    heap.instance_variable_set(:@store, array)
+
+    heap.send(:store).length.downto(0).each do |idx|
+      children_indices = heap.send(:children_indices, idx)
+      heap.send(:heapify_down, idx, children_indices) unless children_indices.empty?
+    end
+
+    heap
+  end
+
+  def to_s
+    "Heap: head=#{self.peek || 'nil'}, length=#{self.length}"
+  end
+
+  def inspect
+    "Heap: head=#{self.peek || 'nil'}, length=#{self.length}"
+  end
+
+  def empty?
+    @store.empty?
+  end
+
+  def length
+    @store.length
+  end
+
   def initialize
     @store = []
   end
 
   def peek
-    raise ArgumentError.new('Heap is empty') if @store.empty?
+    return nil if @store.empty?
     @store.first
   end
 
@@ -19,8 +47,14 @@ class Heap
     el
   end
 
+  def insert_mutliple(arr)
+    raise ArgumentError.new("Can only insert multiple elements via an Array. You passed a #{arr.class}.") unless arr.is_a?(Array)
+    array = self.send(:store) + arr
+    self.class.from_array(array)
+  end
+
   def extract
-    raise ArgumentError.new('Heap is empty') if @store.empty?
+    return nil if @store.empty?
     return @store.shift if @store.length <= 2
 
     @store[0], @store[-1] = @store[-1], @store[0]
@@ -29,11 +63,27 @@ class Heap
     el_idx = 0
     children_indices = children_indices(el_idx)
 
-    heapify_down(el_idx, children_indices)
+    heapify_down(el_idx, children_indices) unless children_indices.empty?
 
     head
   end
 
+  def find(el)
+    return nil if @store.empty? || el < @store.first
+    @store.each { |store_el| return store_el if store_el == el }
+    nil
+  end
+
+  def include?(el)
+    @store.include?(el)
+  end
+
+  def merge(other_heap)
+    raise ArgumentError.new("May only merge with a Heap. You passed a #{other_heap.class}.") unless other_heap.is_a?(Heap)
+    array = self.send(:store) + other_heap.send(:store)
+    self.class.from_array(array)
+  end
+
   private
 
   def heapify_up(el_idx, parent_idx)
@@ -45,7 +95,6 @@ class Heap
   end
 
   def heapify_down(el_idx, children_indices)
-    return if children_indices.empty?
     if children_indices.length == 1
       child_idx = children_indices.first
       if @store[el_idx] > @store[child_idx]
@@ -58,7 +107,7 @@ class Heap
       @store[el_idx], @store[lowest_child_idx] = @store[lowest_child_idx], @store[el_idx]
 
       children_indices = children_indices(lowest_child_idx)
-      heapify_down(lowest_child_idx, children_indices)
+      heapify_down(lowest_child_idx, children_indices) unless children_indices.empty?
     end
   end
 

data/lib/data_structures/linked_list.rb

@@ -30,6 +30,17 @@ class LinkedList
     @head.send(:next) == @tail
   end
 
+  def length
+    return 0 if self.empty?
+    count = 0
+    node = self.first
+    until node == @tail
+      count += 1
+      node = node.send(:next)
+    end
+    count
+  end
+
   def first
     first = @head.send(:next)
     first == @tail ? nil : first

data/lib/data_structures/lru_cache.rb

@@ -12,10 +12,22 @@ class LRUCache
     @linked_list.to_a
   end
 
+  def to_s
+    @linked_list.to_s
+  end
+
+  def inspect
+    @linked_list.inspect
+  end
+
   def empty?
     @size == 0
   end
 
+  def length
+    @size
+  end
+
   def first
     @linked_list.first
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_structures
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Jason Numeroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-05-11 00:00:00.000000000 Z
 dependencies: []
 description: Ruby implementations of a Stack, Queue, Linked List, Binary Tree, LRU
   Cache and Heap. More to come!