rambling-trie 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 403d826dbe4417d5ed4215bb0fd463a4142d51b9
-  data.tar.gz: 363b65990628f645c0d48bdc50803d22c7efbe93
+  metadata.gz: bcea070921c804471c9ddc8d4bbd60bbc700f071
+  data.tar.gz: cff59d6c2a69c99c91993860a0fabf8a20e9f719
 SHA512:
-  metadata.gz: 428848bed7b6bda02217fcec568001bddc6f6ad880af8ac7ca7714b803cb3175a17c70073102c55b270e648140f9e7ff79d40f5f531eda653e022b99e8cedd5e
-  data.tar.gz: 9b7950cf8dd31fc652f07295b968eb680fe535d4f8258d8357d5dd5646f644102ad27ec57012005c1634492e591863e4753607e88b8ff1a73ce8accef85199c7
+  metadata.gz: a0dfdfdf111e29f29730595480ff88a9d056a405b8ef6f0427101c209560c755ab160bb52a59ddd932284dd2dae1b201a43c1c392fac90c7d2406bdb293178e0
+  data.tar.gz: 5efd160643a5a2e165b5b159b6887636bf6a5573acdd20156d55511139e62ad085a92f30049ae30035fddd483593d9b0c360d670a2034939391537b8e65dd9df

data/.gitignore

@@ -4,6 +4,8 @@
 
 # RVM
 .rvmrc
+.ruby-version
+.ruby-gemset
 
 # Gemfile
 Gemfile.lock

data/lib/rambling/trie/branches.rb

@@ -11,18 +11,8 @@ module Rambling
         raise InvalidOperation, 'Cannot add branch to compressed trie' if compressed?
         if word.empty?
           self.terminal = true
-          return
-        end
-
-        first_letter = word.slice(0).to_sym
-
-        if children_tree.has_key? first_letter
-          word.slice! 0
-          child = children_tree[first_letter]
-          child << word
-          child
         else
-          children_tree[first_letter] = Node.new word, self
+          add_to_children_tree word
         end
       end
 
@@ -39,24 +29,36 @@ module Rambling
       end
 
       def word_when_uncompressed?(chars)
-        (chars.empty? && terminal?) || fulfills_uncompressed_condition?(:word_when_uncompressed?, chars)
+        if chars.empty?
+          terminal?
+        else
+          fulfills_uncompressed_condition? :word_when_uncompressed?, chars
+        end
       end
 
       def word_when_compressed?(chars)
-        return true if chars.empty? && terminal?
-
-        first_letter = ''
-        while not chars.empty?
-          first_letter << chars.slice!(0)
-          key = first_letter.to_sym
-          return children_tree[key].word_when_compressed?(chars) if children_tree.has_key? key
+        if chars.empty?
+          terminal?
+        else
+          compressed_trie_has_word? chars
         end
-
-        false
       end
 
       private
 
+      def add_to_children_tree(word)
+        first_letter = word.slice(0).to_sym
+
+        if children_tree.has_key? first_letter
+          word.slice! 0
+          child = children_tree[first_letter]
+          child << word
+          child
+        else
+          children_tree[first_letter] = Node.new word, self
+        end
+      end
+
       def compressed_trie_has_partial_word?(chars)
         current_length = 0
         current_key, current_key_string = current_key chars.slice!(0)
@@ -68,6 +70,19 @@ module Rambling
             return children_tree[current_key].partial_word_when_compressed?(chars)
           end
         end while current_key_string[current_length] == chars.slice!(0)
+
+        false
+      end
+
+      def compressed_trie_has_word?(chars)
+        current_key_string = ''
+
+        while !chars.empty?
+          current_key_string << chars.slice!(0)
+          current_key = current_key_string.to_sym
+          return children_tree[current_key].word_when_compressed?(chars) if children_tree.has_key? current_key
+        end
+
         false
       end
 
@@ -87,13 +102,8 @@ module Rambling
       end
 
       def fulfills_uncompressed_condition?(method, chars)
-        first_letter = chars.slice! 0
-        unless first_letter.nil?
-          first_letter_sym = first_letter.to_sym
-          return children_tree[first_letter_sym].send(method, chars) if children_tree.has_key? first_letter_sym
-        end
-
-        false
+        first_letter_sym = chars.slice!(0).to_sym
+        children_tree.has_key?(first_letter_sym) && children_tree[first_letter_sym].send(method, chars)
       end
     end
   end

data/lib/rambling/trie/version.rb

@@ -1,6 +1,6 @@
 module Rambling
   module Trie
     # Current version of the rambling-trie.
-    VERSION = '0.6.0'
+    VERSION = '0.6.1'
   end
 end

data/reports/performance

@@ -356,3 +356,31 @@ help - true                     6.250000   0.010000   6.260000 (  6.257020)
 beautiful - true                7.980000   0.010000   7.990000 (  7.990850)
 impressionism - true            9.940000   0.010000   9.950000 (  9.952037)
 anthropological - true         10.290000   0.010000  10.300000 ( 10.297771)
+
+Report for rambling-trie version 0.6.1
+==> Uncompressed
+`word?`:
+hi - true                       0.580000   0.000000   0.580000 (  0.588389)
+help - true                     1.160000   0.010000   1.170000 (  1.161375)
+beautiful - true                1.760000   0.000000   1.760000 (  1.752428)
+impressionism - true            2.220000   0.000000   2.220000 (  2.229483)
+anthropological - true          2.470000   0.000000   2.470000 (  2.466127)
+`partial_word?`:
+hi - true                       0.710000   0.000000   0.710000 (  0.710477)
+help - true                     1.230000   0.000000   1.230000 (  1.227881)
+beautiful - true                1.780000   0.000000   1.780000 (  1.786920)
+impressionism - true            2.240000   0.000000   2.240000 (  2.233523)
+anthropological - true          2.450000   0.000000   2.450000 (  2.456224)
+==> Compressed
+`word?`:
+hi - true                       0.770000   0.000000   0.770000 (  0.769701)
+help - true                     1.330000   0.010000   1.340000 (  1.337057)
+beautiful - true                1.950000   0.000000   1.950000 (  1.944460)
+impressionism - true            2.470000   0.000000   2.470000 (  2.478133)
+anthropological - true          2.840000   0.000000   2.840000 (  2.842881)
+`partial_word?`:
+hi - true                       3.180000   0.010000   3.190000 (  3.181099)
+help - true                     6.200000   0.010000   6.210000 (  6.213987)
+beautiful - true                7.880000   0.020000   7.900000 (  7.898417)
+impressionism - true            9.940000   0.010000   9.950000 (  9.948031)
+anthropological - true         10.080000   0.020000  10.100000 ( 10.103292)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rambling-trie
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Edgar Gonzalez
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-10 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A custom implementation of the trie data structure.