binary_search_tree 1.21 → 2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OGFhY2M1ZDE4ZTUzZDQ1MmJmYTlmZWVjNGY1OTAzMGE4ODVmM2E3Yw==
-  data.tar.gz: !binary |-
-    MTM2ODQ5NGZmNTU3OTIyZDUyMGZlMTQ0NDg0MDliZWUzNDUzODRjMA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OThlZDIyZThmNDNhNGViMjM2Zjc2M2M5M2ZjMDNlYmI4Y2I3NjkzMzE5MzA0
-    MTViMWM3ODExYWMxNDgwYjI3M2ViYmYxZDAyMTFhMzQ1ZTViYWJhNjRlZjI2
-    ZGE1YjI3NGQxN2VjNWU4MTI3ZGJkZTVhNDY0NmIyMDI2NjY4YTA=
-  data.tar.gz: !binary |-
-    ZDhhMTNiZGNiZGVkMDAwMTlmNTJiOGU3MDY2NTkxNTRiODEwYjkzNmVjMmJj
-    NmQ3YmZmNmE4YTQ1ODBkMTg1NzA5ODI3ZWFhNGY4OGVkNTk1NzQ0NzEyNmJk
-    ZGJmZTc4YmNkNTI0YTU1MzFkOTczNTFhNjJjNTQ3N2M2MjI1NTQ=
+SHA1:
+  metadata.gz: 03a236331048d1d421274964c9bb1f786a2433f8
+  data.tar.gz: dc1468a43def290f733104a9df3cd23966c80dd5
+SHA512:
+  metadata.gz: 3809ba134072969efddf39f35284abaf407680821c17eab8932d7b05133ef651eb81ae6ff78793a99fe11c28a703f2b8af892305098a7e499e807f5d21d271e6
+  data.tar.gz: 3edbf53d2331c7629d2aa4dbffac2930ec9aa99a16786cf34a7888f4af1380e7fd53eb947f026da982062cfb6fdb1b378e39490176ad7a1b93e5fca96b40bff5

data/lib/binary_search_tree.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/object/blank'
 class BinaryNode
   attr_accessor :height, :parent, :left, :right, :key, :value
 
@@ -134,7 +135,9 @@ class BinarySearchTree
   end
 
   def put element, value, leaf, parent, link_type=nil
+    #once you reach a point where you can place a new node
     if leaf.nil?
+      #create that new node
       leaf = BinaryNode.new element, value, parent
       @size += 1
       invalidate_cached_values
@@ -148,8 +151,11 @@ class BinarySearchTree
         @root = leaf
       end
       if parent.present? && parent.height.zero?
+        #if it has a parent but it is balanced, move up
         node = parent
         node_to_rebalance = nil
+
+        #continue moving up until you git the root
         while node.present?
           node.height = node.max_children_height + 1
           if node.balance_factor.abs > 1
@@ -158,6 +164,7 @@ class BinarySearchTree
           end
           node = node.parent
         end
+        #if at any point you reach an unbalanced node, rebalance it
         rebalance node_to_rebalance if node_to_rebalance.present?
       end
 
@@ -203,64 +210,130 @@ class BinarySearchTree
     raise "assertion failed" unless condition
   end
 
+  def rrc_rebalance a, f
+
+    #puts "performing rrc rebalance"
+    b = a.right
+    c = b.right
+    assert a.present? && b.present? && c.present?
+    a.right = b.left
+    if a.right.present?
+      a.right.parent = a
+    end
+    b.left = a
+    a.parent = b
+    if f.nil?
+      @root = b
+      @root.parent = nil
+    else
+      if f.right == a
+        f.right = b
+      else
+        f.left = b
+      end
+      b.parent = f
+    end
+    recompute_heights a
+    recompute_heights b.parent
+  end
+
+  def rlc_rebalance a, f
+
+    #puts "performing rlc rebalance"
+    b = a.right
+    c = b.left
+    assert a.present? && b.present? && c.present?
+    b.left = c.right
+    if b.left.present?
+      b.left.parent = b
+    end
+    a.right = c.left
+    if a.right.present?
+      a.right.parent = a
+    end
+    c.right = b
+    b.parent = c
+    c.left = a
+    a.parent = c
+    if f.nil?
+      @root = c
+      @root.parent = nil
+    else
+      if f.right == a
+        f.right = c
+      else
+        f.left = c
+      end
+      c.parent = f
+    end
+    recompute_heights a
+    recompute_heights b
+  end
+
+  def llc_rebalance a, b, c, f
+    #puts "performing llc rebalance"
+    assert a.present? && b.present? && c.present?
+    a.left = b.right
+    if a.left
+      a.left.parent = a
+    end
+    b.right = a
+    a.parent = b
+    if f.nil?
+      @root = b
+      @root.parent = nil
+    else
+      if f.right == a
+        f.right = b
+      else
+        f.left = b
+      end
+      b.parent = f
+    end
+    recompute_heights a
+    recompute_heights b.parent
+  end
+
+  def lrc_rebalance a, b, c, f
+    #puts "performing lrc rebalance"
+    assert a.present? && b.present? && c.present?
+    a.left = c.right
+    if a.left.present?
+      a.left.parent = a
+    end
+    b.right = c.left
+    if b.right.present?
+      b.right.parent = b
+    end
+    c.left = b
+    b.parent = c
+    c.right = a
+    a.parent = c
+    if f.nil?
+      @root = c
+      @root.parent = nil
+    else
+      if f.right == a
+        f.right = c
+      else
+        f.left = c
+      end
+      c.parent = f
+    end
+    recompute_heights a
+    recompute_heights b
+  end
+
   def rebalance node_to_rebalance
     a = node_to_rebalance
     f = a.parent #allowed to be NULL
     if node_to_rebalance.balance_factor == -2
       if node_to_rebalance.right.balance_factor <= 0
         # """Rebalance, case RRC """
-        b = a.right
-        c = b.right
-        assert a.present? && b.present? && c.present?
-        a.right = b.left
-        if a.right.present?
-          a.right.parent = a
-        end
-        b.left = a
-        a.parent = b
-        if f.nil?
-          @root = b
-          @root.parent = nil
-        else
-          if f.right == a
-            f.right = b
-          else
-            f.left = b
-          end
-          b.parent = f
-        end
-        recompute_heights a
-        recompute_heights b.parent
+        rrc_rebalance a, f
       else
+        rlc_rebalance a, f
         # """Rebalance, case RLC """
-        b = a.right
-        c = b.left
-        assert a.present? && b.present? && c.present?
-        b.left = c.right
-        if b.left.present?
-          b.left.parent = b
-        end
-        a.right = c.left
-        if a.right.present?
-          a.right.parent = a
-        end
-        c.right = b
-        b.parent = c
-        c.left = a
-        a.parent = c
-        if f.nil?
-          @root = c
-          @root.parent = nil
-        else
-          if f.right == a
-            f.right = c
-          else
-            f.left = c
-          end
-          c.parent = f
-        end
-        recompute_heights a
-        recompute_heights b
       end
     else
       assert node_to_rebalance.balance_factor == 2
@@ -268,56 +341,12 @@ class BinarySearchTree
         b = a.left
         c = b.left
         # """Rebalance, case LLC """
-        assert a.present? && b.present? && c.present?
-        a.left = b.right
-        if a.left
-          a.left.parent = a
-        end
-        b.right = a
-        a.parent = b
-        if f.nil?
-          @root = b
-          @root.parent = nil
-        else
-          if f.right == a
-            f.right = b
-          else
-            f.left = b
-          end
-          b.parent = f
-        end
-        recompute_heights a
-        recompute_heights b.parent
+        llc_rebalance a, b, c, f
       else
         b = a.left
         c = b.right
         #  """Rebalance, case LRC """
-        assert a.present? && b.present? && c.present?
-        a.left = c.right
-        if a.left.present?
-          a.left.parent = a
-        end
-        b.right = c.left
-        if b.right.present?
-          b.right.parent = b
-        end
-        c.left = b
-        b.parent = c
-        c.right = a
-        a.parent = c
-        if f.nil?
-          @root = c
-          @root.parent = nil
-        else
-          if f.right == a
-            f.right = c
-          else
-            f.left = c
-          end
-          c.parent = f
-        end
-        recompute_heights a
-        recompute_heights b
+        lrc_rebalance a, b, c, f
       end
     end
   end
@@ -477,4 +506,17 @@ class BinarySearchTree
 
 end
 
-require 'binary_search_tree_hash.rb'
+# #require 'binary_search_tree_hash.rb'
+# tree = BinarySearchTree.new
+# puts "inserting 9"
+# tree.insert(9, "nine")
+# puts "inserting 5"
+# tree.insert(5, "five")
+# puts "inserting 10"
+# tree.insert(10, "ten")
+# puts "inserting 1"
+# tree.insert(1, "ten")
+# puts "inserting 3"
+# tree.insert(3, "ten")
+# puts "inserting 7"
+# tree.insert(7, "ten")

data/lib/binary_search_tree_hash.rb

@@ -40,7 +40,7 @@ class BinarySearchTreeHash
   end
 
   def values
-    map{ |node| node.second }    
+    map{ |node| node.second }
   end
 
   def to_a
@@ -56,7 +56,7 @@ class BinarySearchTreeHash
   end
 
   def max
-    [@bst.max.key, @bst.max.value]    
+    [@bst.max.key, @bst.max.value]
   end
 
   def each
@@ -93,7 +93,7 @@ class BinarySearchTreeHash
         nodes[i] = nil
       end
     end
-    changed ? nodes.compact.map{ |node| [node.key, node.value] } : nil 
+    changed ? nodes.compact.map{ |node| [node.key, node.value] } : nil
   end
 
   def delete_if
@@ -129,7 +129,7 @@ class BinarySearchTreeHash
   end
 
   def has_value? value
-    @bst.find_value(value).present?  
+    @bst.find_value(value).present?
   end
 
   def value? value
@@ -185,4 +185,6 @@ private
   def bst
     @bst
   end
-end
+end
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: binary_search_tree
 version: !ruby/object:Gem::Version
-  version: '1.21'
+  version: '2.0'
 platform: ruby
 authors:
 - Misha Conway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: MishaAConway@gmail.com
@@ -28,17 +28,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: nowarning
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A self balancing avl binary search tree class. Also includes BinarySearchTreeHash