rambling-trie 0.3.0 → 0.3.2

data/lib/invalid_trie_operation.rb

@@ -1,4 +1,7 @@
 module Rambling
   class InvalidTrieOperation < Exception
+    def initialize(message = nil)
+      super
+    end
   end
 end

data/lib/rambling-trie.rb

@@ -1,6 +1,7 @@
 require File.join(File.dirname(__FILE__), 'invalid_trie_operation.rb')
 require File.join(File.dirname(__FILE__), 'children_hash_deferer.rb')
 require File.join(File.dirname(__FILE__), 'trie_compressor.rb')
+require File.join(File.dirname(__FILE__), 'trie_branches.rb')
 require File.join(File.dirname(__FILE__), 'trie_node.rb')
 require File.join(File.dirname(__FILE__), 'trie.rb')
 

data/lib/trie.rb

@@ -4,16 +4,29 @@ module Rambling
       super(nil)
 
       @filename = filename
+      @is_compressed = false
       add_all_nodes if filename
     end
 
     def compress!
-      @is_compressed = true
-      super
+      unless compressed?
+        compress_own_tree!
+        @is_compressed = true
+      end
+
+      self
     end
 
     def compressed?
-      @is_compressed
+      @is_compressed = @is_compressed.nil? ? false : @is_compressed
+    end
+
+    def has_branch_for?(word = '')
+      compressed? ? has_compressed_branch_for?(word) : has_uncompressed_branch_for?(word)
+    end
+
+    def is_word?(word = '')
+      compressed? ? is_compressed_word?(word) : is_uncompressed_word?(word)
     end
 
     private

data/lib/trie_branches.rb

@@ -0,0 +1,68 @@
+module Rambling
+  module TrieBranches
+    def add_branch_from(word)
+      raise InvalidTrieOperation.new('Cannot add branch to compressed trie') if compressed?
+      if word.empty?
+        @is_terminal = true
+        return
+      end
+
+      first_letter = word.slice(0).to_sym
+
+      if @children.has_key?(first_letter)
+        word.slice!(0)
+        @children[first_letter].add_branch_from(word)
+      else
+        @children[first_letter] = TrieNode.new(word, self)
+      end
+    end
+
+    protected
+
+    def has_uncompressed_branch_for?(word = '')
+      word.empty? or fulfills_uncompressed_condition?(:has_uncompressed_branch_for?, word)
+    end
+
+    def fulfills_uncompressed_condition?(method, word)
+      clone = word.clone
+      first_letter = clone.slice!(0)
+      unless first_letter.nil?
+        first_letter_sym = first_letter.to_sym
+        return @children[first_letter_sym].send(method, clone) if @children.has_key?(first_letter_sym)
+      end
+
+      false
+    end
+
+    def has_compressed_branch_for?(word = '')
+      return true if word.empty?
+
+      keys = @children.keys.map { |x| x.to_s }
+      return true if keys.include?(word)
+
+      partial_key = keys.select { |x| x.start_with?(word) }.first
+      return true unless partial_key.nil?
+
+      key = keys.select { |x| word.start_with?(x) }.first
+      return @children[key.to_sym].has_compressed_branch_for?(word.slice(key.length..word.length)) unless key.nil?
+
+      false
+    end
+
+    def is_uncompressed_word?(word = '')
+      (word.empty? and terminal?) or fulfills_uncompressed_condition?(:is_uncompressed_word?, word)
+    end
+
+    def is_compressed_word?(word = '')
+      return true if word.empty? and terminal?
+
+      length = word.length
+      for index in (0...length)
+        key = word.slice(0..index).to_sym
+        return @children[key].is_compressed_word?(word.slice((index + 1)...length)) if @children.has_key?(key)
+      end
+
+      false
+    end
+  end
+end

data/lib/trie_compressor.rb

@@ -1,12 +1,22 @@
 module Rambling
   module TrieCompressor
-    def compress!
-      if @children.size == 1 and not terminal?
+    def compressed?
+      if instance_variable_defined?(:@is_compressed)
+        @is_compressed
+      else
+        @parent.nil? ? false : @parent.compressed?
+      end
+    end
+
+    protected
+
+    def compress_own_tree!
+      if @children.size == 1 and not terminal? and not @letter.nil?
         merge_with!(@children.values.first)
-        compress!
+        compress_own_tree!
       end
 
-      @children.values.each { |node| node.compress! }
+      @children.values.each { |node| node.compress_own_tree! }
 
       self
     end

data/lib/trie_node.rb

@@ -2,6 +2,7 @@ module Rambling
   class TrieNode
     include ChildrenHashDeferer
     include TrieCompressor
+    include TrieBranches
 
     attr_reader :letter, :children, :parent
 
@@ -27,32 +28,11 @@ module Rambling
       @is_terminal
     end
 
-    def add_branch_from(word)
-      return if word.empty?
-
-      first_letter = word.slice(0).to_sym
-
-      if @children.has_key?(first_letter)
-        word.slice!(0)
-        @children[first_letter].add_branch_from(word)
-      else
-        @children[first_letter] = TrieNode.new(word, self)
-      end
-    end
-
-    def has_branch_for?(word)
-      word.empty? or branch_exists_and(word, :has_branch_for?)
-    end
-
     def as_word
       raise InvalidTrieOperation.new() unless @letter.nil? or terminal?
       get_letter_string
     end
 
-    def is_word?(word = '')
-      (word.empty? and terminal?) or branch_exists_and(word, :is_word?)
-    end
-
     protected
     def get_letter_string
       (@parent.nil? ? '' : @parent.get_letter_string) + @letter.to_s
@@ -61,16 +41,5 @@ module Rambling
     def parent=(parent)
       @parent = parent
     end
-
-    private
-
-    def branch_exists_and(word, method)
-      first_letter = word.slice!(0)
-
-      return false if first_letter.nil?
-
-      first_letter_key = first_letter.to_sym
-      @children.has_key?(first_letter_key) ? @children[first_letter_key].send(method, word) : false
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rambling-trie
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000 Z
+date: 2012-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15464280 !ruby/object:Gem::Requirement
+  requirement: &14554820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,18 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *15464280
+  version_requirements: *14554820
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &14554220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: *14554220
 description: The Rambling Trie is a custom implementation of the Trie data structure
   with Ruby, which includes compression abilities and is designed to be very fast
   to traverse.
@@ -34,6 +45,7 @@ files:
 - ./lib/invalid_trie_operation.rb
 - ./lib/rambling-trie.rb
 - ./lib/trie.rb
+- ./lib/trie_branches.rb
 - ./lib/trie_compressor.rb
 - ./lib/trie_node.rb
 - LICENSE
@@ -58,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A custom implementation of the trie data structure.