avl_tree 1.1.1 → 1.1.2

data/bench/bench.rb

@@ -1,5 +1,4 @@
 require 'benchmark'
-require 'radix_tree' # gem install radix_tree
 require 'avl_tree'
 require 'red_black_tree'
 require 'openssl'
@@ -47,7 +46,6 @@ end
 
 Benchmark.bmbm do |bm|
   run(bm, Hash.new, keys)
-  run(bm, RadixTree.new, keys)
   run(bm, AVLTree.new, keys)
   run(bm, RedBlackTree.new, keys)
 end

data/lib/avl_tree.rb

@@ -4,65 +4,6 @@ class AVLTree
   class Node
     UNDEFINED = Object.new
 
-    class EmptyNode
-      def empty?
-        true
-      end
-
-      def height
-        0
-      end
-
-      def value
-        nil
-      end
-
-      def size
-        0
-      end
-
-      def each(&block)
-        # intentionally blank
-      end
-
-      # returns new_root
-      def insert(key, value)
-        Node.new(key, value)
-      end
-
-      # returns value
-      def retrieve(key)
-        UNDEFINED
-      end
-
-      # returns [deleted_node, new_root]
-      def delete(key)
-        [self, self]
-      end
-
-      def dump_tree(io, indent = '')
-        # intentionally blank
-      end
-
-      def dump_sexp
-        # intentionally blank
-      end
-
-      def rotate
-        self
-      end
-
-      def update_height
-        # intentionally blank
-      end
-
-      # for debugging
-      def check_height
-        # intentionally blank
-      end
-    end
-    EMPTY = Node::EmptyNode.new
-
     attr_reader :key, :value, :height
     attr_reader :left, :right
 
@@ -285,6 +226,63 @@ class AVLTree
       end
       pool
     end
+
+    class EmptyNode < Node
+      def initialize
+        @value = nil
+        @height = 0
+      end
+
+      def empty?
+        true
+      end
+
+      def size
+        0
+      end
+
+      def each(&block)
+        # intentionally blank
+      end
+
+      # returns new_root
+      def insert(key, value)
+        Node.new(key, value)
+      end
+
+      # returns value
+      def retrieve(key)
+        UNDEFINED
+      end
+
+      # returns [deleted_node, new_root]
+      def delete(key)
+        [self, self]
+      end
+
+      def dump_tree(io, indent = '')
+        # intentionally blank
+      end
+
+      def dump_sexp
+        # intentionally blank
+      end
+
+      def rotate
+        self
+      end
+
+      def update_height
+        # intentionally blank
+      end
+
+      # for debugging
+      def check_height
+        # intentionally blank
+      end
+    end
+    EMPTY = Node::EmptyNode.new.freeze
+
   end
 
   DEFAULT = Object.new

data/lib/red_black_tree.rb

@@ -67,18 +67,18 @@ class RedBlackTree
       case key <=> @key
       when -1
         @left = @left.insert(key, value)
-        if black? and @left.red? and !@left.children_both_black?
+        if black? and @right.black? and @left.red? and !@left.children_both_black?
           ret = rebalance_for_left_insert
         end
       when 0
         @value = value
       when 1
         @right = @right.insert(key, value)
-        if black? and @right.red? and !@right.children_both_black?
+        if black? and @left.black? and @right.red? and !@right.children_both_black?
           ret = rebalance_for_right_insert
         end
       end
-      ret
+      ret.pullup_red
     end
 
     # returns value
@@ -304,40 +304,40 @@ class RedBlackTree
       root
     end
 
+    # Pull up red nodes
+    # (b (A C)) where A and C are RED --> (B (a c))
+    #
+    #   b          B
+    #  / \   ->   / \
+    # A   C      a   c
+    #
+    def pullup_red
+      if black? and @left.red? and @right.red?
+        @left.color = @right.color = :BLACK
+        self.color = :RED
+      end
+      self
+    end
+
   private
 
     # trying to rebalance when the left sub-tree is 1 level higher than the right
     # precondition: self is black and @left is red
     def rebalance_for_left_insert
-      ret = self
-      if @right.red?
-        # pull-up red nodes and let the parent rebalance (see precondition)
-        @color = :RED
-        @left.color = @right.color = :BLACK
-      else
-        # move 1 black from the left to the right by single/double rotation
-        if @left.right.red?
-          @left = @left.rotate_left
-        end
-        ret = rotate_right
+      # move 1 black from the left to the right by single/double rotation
+      if @left.right.red?
+        @left = @left.rotate_left
       end
-      ret
+      rotate_right
     end
 
     # trying to rebalance when the right sub-tree is 1 level higher than the left
     # See rebalance_for_left_insert.
     def rebalance_for_right_insert
-      ret = self
-      if @left.red?
-        @color = :RED
-        @left.color = @right.color = :BLACK
-      else
-        if @right.left.red?
-          @right = @right.rotate_right
-        end
-        ret = rotate_left
+      if @right.left.red?
+        @right = @right.rotate_right
       end
-      ret
+      rotate_left
     end
 
     def delete_self
@@ -377,23 +377,16 @@ class RedBlackTree
       pool
     end
 
-    class EmptyNode
-      def red?
-        false
-      end
-
-      def black?
-        true
+    class EmptyNode < Node
+      def initialize
+        @value = nil
+        @color = :BLACK
       end
 
       def empty?
         true
       end
 
-      def value
-        nil
-      end
-
       def size
         0
       end
@@ -425,7 +418,7 @@ class RedBlackTree
         # intentionally blank
       end
     end
-    EMPTY = Node::EmptyNode.new
+    EMPTY = Node::EmptyNode.new.freeze
   end
 
   DEFAULT = Object.new

data/test/test_avl_tree.rb

@@ -432,6 +432,12 @@ class TestAVLTree < Test::Unit::TestCase
     assert_equal [1.3, 'a' ], h.first
   end
 
+  def test_values_for_empty_tree
+    h = AVLTree.new
+
+    assert_equal [], h.values
+  end
+
   if RUBY_VERSION >= '1.9.0'
     # In contrast to RadixTree, AVLTree just uses String#<=> as-is
     def test_encoding

data/test/test_red_black_tree.rb

@@ -51,7 +51,7 @@ class TestRedBlackTree < Test::Unit::TestCase
     h['c'] = 6
     assert_equal '(b a (g (d c) h))', h.dump_sexp
     h['e'] = 6
-    assert_equal '(b a (g (d c e) h))', h.dump_sexp
+    assert_equal '(d (b a c) (g e h))', h.dump_sexp
     h['f'] = 6
     assert_equal '(d (b a c) (g (e - f) h))', h.dump_sexp
   end
@@ -67,7 +67,7 @@ class TestRedBlackTree < Test::Unit::TestCase
     h['0'] = 7
     h['c'] = 8
     h['e'] = 9
-    assert_equal '(g (b (a 0) (d c e)) (h - i))', h.dump_sexp
+    assert_equal '(d (b (a 0) c) (g e (h - i)))', h.dump_sexp
     h['f'] = 10
     assert_equal '(d (b (a 0) c) (g (e - f) (h - i)))', h.dump_sexp
   end
@@ -247,9 +247,9 @@ class TestRedBlackTree < Test::Unit::TestCase
     h['f'] = 8
     h['h'] = 9
     h['j'] = 10
-    assert_equal '(c (b a) (g (e d f) (i h j)))', h.dump_sexp
+    assert_equal '(e (c (b a) d) (g f (i h j)))', h.dump_sexp
     h.delete('g')
-    assert_equal '(c (b a) (h (e d f) (i - j)))', h.dump_sexp
+    assert_equal '(e (c (b a) d) (h f (i - j)))', h.dump_sexp
   end
 
   def test_delete_node_left
@@ -264,9 +264,9 @@ class TestRedBlackTree < Test::Unit::TestCase
     h['e'] = 8
     h['c'] = 9
     h['a'] = 10
-    assert_equal '(h (d (b a c) (f e g)) (i - j))', h.dump_sexp
+    assert_equal '(f (d (b a c) e) (h g (i - j)))', h.dump_sexp
     h.delete('d')
-    assert_equal '(h (e (b a c) (f - g)) (i - j))', h.dump_sexp
+    assert_equal '(f (b a (e c)) (h g (i - j)))', h.dump_sexp
   end
 
   def test_delete_root
@@ -582,6 +582,12 @@ class TestRedBlackTree < Test::Unit::TestCase
     assert_equal [1.3, 'a' ], h.first
   end
 
+  def test_values_for_empty_tree
+    h = RedBlackTree.new
+
+    assert_equal [], h.values
+  end
+
   if RUBY_VERSION >= '1.9.0'
     # In contrast to RadixTree, RedBlackTree just uses String#<=> as-is
     def test_encoding

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avl_tree
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000 Z
+date: 2012-03-27 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: nahi@ruby-lang.org