avl_tree 1.1.0 → 1.1.1

data/README

@@ -1,17 +1,12 @@
-avl_tree - Naive implementation of AVL tree for Ruby
+avl_tree - AVL tree and Red-black tree in Ruby
 Copyright (C) 2012 Hiroshi Nakamura <nahi@ruby-lang.org>
 
 
-== TODO
-
-It's still under development.
-
-
 == Author
 
 Name:: Hiroshi Nakamura
 E-mail:: nahi@ruby-lang.org
-Project web site:: http://github.com/nahi/radix_tree
+Project web site:: http://github.com/nahi/avl_tree
 
 
 == License

data/lib/avl_tree.rb

@@ -355,17 +355,17 @@ class AVLTree
   end
 
   def []=(key, value)
-    @root = @root.insert(key.to_s, value)
+    @root = @root.insert(key, value)
   end
   alias insert []=
 
   def key?(key)
-    @root.retrieve(key.to_s) != Node::UNDEFINED
+    @root.retrieve(key) != Node::UNDEFINED
   end
   alias has_key? key?
 
   def [](key)
-    value = @root.retrieve(key.to_s)
+    value = @root.retrieve(key)
     if value == Node::UNDEFINED
       default_value
     else
@@ -374,7 +374,7 @@ class AVLTree
   end
 
   def delete(key)
-    deleted, @root = @root.delete(key.to_s)
+    deleted, @root = @root.delete(key)
     deleted.value
   end
 

data/lib/red_black_tree.rb

@@ -307,12 +307,15 @@ class RedBlackTree
   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
@@ -322,6 +325,7 @@ class RedBlackTree
     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?
@@ -492,19 +496,19 @@ class RedBlackTree
   end
 
   def []=(key, value)
-    @root = @root.insert(key.to_s, value)
+    @root = @root.insert(key, value)
     @root.set_root
     @root.check_height if $DEBUG
   end
   alias insert []=
 
   def key?(key)
-    @root.retrieve(key.to_s) != Node::UNDEFINED
+    @root.retrieve(key) != Node::UNDEFINED
   end
   alias has_key? key?
 
   def [](key)
-    value = @root.retrieve(key.to_s)
+    value = @root.retrieve(key)
     if value == Node::UNDEFINED
       default_value
     else
@@ -513,7 +517,7 @@ class RedBlackTree
   end
 
   def delete(key)
-    deleted, @root, rebalance = @root.delete(key.to_s)
+    deleted, @root, rebalance = @root.delete(key)
     unless empty?
       @root.set_root
       @root.check_height if $DEBUG

data/test/test_avl_tree.rb

@@ -372,9 +372,9 @@ class TestAVLTree < Test::Unit::TestCase
 
   def test_to_s
     h = AVLTree.new
-    h[:abc] = 1
-    assert_equal 1, h["abc"]
-    assert_equal 1, h[:abc]
+    h[5] = 1
+    assert_equal 1, h[5]
+    assert_nil h["5"]
   end
 
   def test_key?
@@ -424,6 +424,14 @@ class TestAVLTree < Test::Unit::TestCase
     assert h.to_hash.empty?
   end
 
+  def test_non_string_keys
+    h = AVLTree.new
+    h[1.3] = 'a'
+    h[4.3] = 'b'
+
+    assert_equal [1.3, 'a' ], h.first
+  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

@@ -522,9 +522,9 @@ class TestRedBlackTree < Test::Unit::TestCase
 
   def test_to_s
     h = RedBlackTree.new
-    h[:abc] = 1
-    assert_equal 1, h["abc"]
-    assert_equal 1, h[:abc]
+    h[5] = 1
+    assert_equal 1, h[5]
+    assert_nil h["5"]
   end
 
   def test_key?
@@ -574,6 +574,14 @@ class TestRedBlackTree < Test::Unit::TestCase
     assert h.to_hash.empty?
   end
 
+  def test_non_string_keys
+    h = RedBlackTree.new
+    h[1.3] = 'a'
+    h[4.3] = 'b'
+
+    assert_equal [1.3, 'a' ], h.first
+  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.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-05 00:00:00.000000000 Z
+date: 2012-03-19 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: nahi@ruby-lang.org