radix_tree 1.0.0.dev.2 → 1.0.0

data/lib/radix_tree.rb

@@ -4,6 +4,20 @@
 # 25 times slower for 10 bytes key, 100000 elements insertion
 # 10 times slower for 10 bytes key, 100000 elements retrieval
 #
+# TODO: Implement following methods for Hash compatibility.
+# * delete_if
+# * reject
+# * reject!
+# * fetch
+# * values_at
+# * replace
+# * key
+# * shift
+# * has_value?/value?
+# * ==
+# * eql?
+# * hash
+#
 # TODO: Implement following features for utilizing strength of Radix Tree.
 # * find predecessor
 # * find successor
@@ -28,7 +42,7 @@ class RadixTree
     end
 
     def empty?
-      @children.nil? and undefined?
+      !@children and undefined?
     end
 
     def size
@@ -101,14 +115,7 @@ class RadixTree
         if child = find_child(key)
           value = child.delete(key)
           if value and child.undefined?
-            if child.children.nil?
-              delete_child(child)
-            elsif child.children.size == 1
-              # pull up the grand child as a child
-              delete_child(child)
-              grand = child.children.values.first
-              add_child(Node.new(child.key + grand.key, grand.value, grand.children))
-            end
+            reap(child)
           end
           value
         end
@@ -156,6 +163,17 @@ class RadixTree
       add_child(child)
     end
 
+    def reap(child)
+      if !child.children
+        delete_child(child)
+      elsif child.children.size == 1
+        # pull up the grand child as a child
+        delete_child(child)
+        grand = child.children.values.first
+        add_child(Node.new(child.key + grand.key, grand.value, grand.children))
+      end
+    end
+
     def child_key(key)
       key[head_match_length(key)..-1]
     end
@@ -190,6 +208,9 @@ class RadixTree
   end
 
   DEFAULT = Object.new
+
+  attr_accessor :default
+  attr_reader :default_proc
   
   def initialize(default = DEFAULT, &block)
     if block && default != DEFAULT
@@ -207,9 +228,50 @@ class RadixTree
   def size
     @root.size
   end
+  alias length size
 
   def each(&block)
-    @root.each('', &block)
+    if block_given?
+      @root.each('', &block)
+      self
+    else
+      Enumerator.new { |yielder|
+        @root.each('') do |k, v|
+          yielder << [k, v]
+        end
+      }
+    end
+  end
+  alias each_pair each
+
+  def each_key
+    if block_given?
+      @root.each('') do |k, v|
+        yield k
+      end
+      self
+    else
+      Enumerator.new { |yielder|
+        @root.each('') do |k, v|
+          yielder << k
+        end
+      }
+    end
+  end
+
+  def each_value
+    if block_given?
+      @root.each('') do |k, v|
+        yield v
+      end
+      self
+    else
+      Enumerator.new { |yielder|
+        @root.each('') do |k, v|
+          yielder << v
+        end
+      }
+    end
   end
 
   def keys
@@ -220,9 +282,14 @@ class RadixTree
     @root.values('')
   end
 
+  def clear
+    @root = Node.new('')
+  end
+
   def []=(key, value)
     @root.store(key.to_s, value)
   end
+  alias store []=
 
   def key?(key)
     @root.retrieve(key.to_s) != Node::UNDEFINED
@@ -252,4 +319,8 @@ class RadixTree
     @root.dump_tree(io)
     io
   end
+
+  def to_hash
+    inject({}) { |r, (k, v)| r[k] = v; r }
+  end
 end

data/test/helper.rb

@@ -1,4 +1,7 @@
-require 'simplecov'
-SimpleCov.start
+begin
+  require 'simplecov'
+  SimpleCov.start
+rescue LoadError
+end
 require "test/unit"
 require "radix_tree"

data/test/test_radix_tree.rb

@@ -181,6 +181,8 @@ class TestRadixTree < Test::Unit::TestCase
     s.each do |k, v|
       h[k] = v
     end
+    assert_equal s.to_a.sort_by { |k, v| k }, h.each.sort_by { |k, v| k }
+    #
     values = []
     h.each do |k, v|
       values << [k, v]
@@ -188,6 +190,36 @@ class TestRadixTree < Test::Unit::TestCase
     assert_equal s.to_a.sort_by { |k, v| k }, values.sort_by { |k, v| k }
   end
 
+  def test_each_key
+    h = RadixTree.new
+    s = { 'aa' => 1, 'ab' => 2, 'bb' => 3, 'bc' => 4, 'a' => 5, 'abc' => 6 }
+    s.each do |k, v|
+      h[k] = v
+    end
+    assert_equal s.keys.sort, h.each_key.sort
+    #
+    values = []
+    h.each_key do |k|
+      values << k
+    end
+    assert_equal s.keys.sort, values.sort
+  end
+
+  def test_each_value
+    h = RadixTree.new
+    s = { 'aa' => 1, 'ab' => 2, 'bb' => 3, 'bc' => 4, 'a' => 5, 'abc' => 6, 'azzzzz' => 6 }
+    s.each do |k, v|
+      h[k] = v
+    end
+    assert_equal s.values.sort, h.each_value.sort
+    #
+    values = []
+    h.each_value do |v|
+      values << v
+    end
+    assert_equal s.values.sort, values.sort
+  end
+
   def test_keys
     h = RadixTree.new
     s = { 'aa' => 1, 'ab' => 2, 'bb' => 3, 'bc' => 4, 'a' => 5, 'abc' => 6 }
@@ -239,6 +271,27 @@ class TestRadixTree < Test::Unit::TestCase
     assert h['baz'].object_id != h['qux'].object_id
   end
 
+  def test_to_hash
+    h = RadixTree.new
+    s = { 'aa' => 1, 'ab' => 2, 'bb' => 3, 'bc' => 4, 'a' => 5, 'abc' => 6 }
+    s.each do |k, v|
+      h[k] = v
+    end
+    assert_equal s, h.to_hash
+  end
+
+  def test_clear
+    h = RadixTree.new
+    s = { 'aa' => 1, 'ab' => 2, 'bb' => 3, 'bc' => 4, 'a' => 5, 'abc' => 6 }
+    s.each do |k, v|
+      h[k] = v
+    end
+    assert_equal s, h.to_hash
+    h.clear
+    assert_equal 0, h.size
+    assert h.to_hash.empty?
+  end
+
   if RUBY_VERSION >= '1.9.0'
     def test_encoding
       h = RadixTree.new

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: radix_tree
 version: !ruby/object:Gem::Version
-  version: 1.0.0.dev.2
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Hiroshi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000 Z
+date: 2012-01-06 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: nahi@ruby-lang.org
@@ -33,12 +33,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -966188071225850011
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -966188071225850011
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11