text 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 990ce640247dc172ad5e84a54bec8349ccdf55bb
-  data.tar.gz: 25c46a8bfe4fd410959be538b10b2a288e70cbcb
+  metadata.gz: 84969e89321dfeb30067b4b526928330964281a5
+  data.tar.gz: 79da28e5584e6ecd0d35c18cafb5bbd5a1e46989
 SHA512:
-  metadata.gz: 6d506f2ae153149a6ebd288ce61a540931fd5d944bc661a582ba8a1fffbdaaf454873e690308202826127d8849c3ec8892969100ad224c51cf61aa5d20fde48c
-  data.tar.gz: 5ffcc3933066fb5131f7da6b438f89fec87d047bc2703e5ad7b4d0ed3a433c4de8c1862c66b8ff7b6dbdcb7aa7e9646c9f8594cd3e6a0630e7a25b0b7bf8e7fb
+  metadata.gz: 49a658384d4f666da44a3bfea41c44632fa7a9b444ae132c079c87ac236be27ce34fb0f38c320c992aba51068c621c073f9fa7c184d883019921ea2710a6359d
+  data.tar.gz: cc04c2a8736339afd408514853df8fc0d8dd298be0adbbc2c6b47d0aaeceb31a534be8ca395efc34221933c7a4894cd5a5724a5da81b2cf8f14302ad178b9dd1

data/lib/text/levenshtein.rb

@@ -36,14 +36,15 @@ module Levenshtein
 
 private
   def distance_with_maximum(str1, str2, max_distance) # :nodoc:
-    s, t = [str1, str2].sort_by(&:length).
-                        map{ |str| str.encode(Encoding::UTF_8).unpack("U*") }
+    s = str1.encode(Encoding::UTF_8).unpack("U*")
+    t = str2.encode(Encoding::UTF_8).unpack("U*")
+
     n = s.length
     m = t.length
     big_int = n * m
-    return m if n.zero?
-    return n if m.zero?
-    return 0 if s == t
+
+    # Swap if necessary so that s is always the shorter of the two strings
+    s, t, n, m = t, s, m, n if m < n
 
     # If the length difference is already greater than the max_distance, then
     # there is nothing else to check
@@ -51,6 +52,10 @@ private
       return max_distance
     end
 
+    return 0 if s == t
+    return m if n.zero?
+    return n if m.zero?
+
     # The values necessary for our threshold are written; the ones after must
     # be filled with large integers since the tailing member of the threshold
     # window in the bottom array will run min across them
@@ -84,10 +89,12 @@ private
       # computer science and computational biology.
       # Cambridge, UK: Cambridge University Press. ISBN 0-521-58519-8.
       # pp. 263–264.
-      min = [0, i - max_distance - 1].max
-      max = [m - 1, i + max_distance].min
+      min = i - max_distance - 1
+      min = 0 if min < 0
+      max = i + max_distance
+      max = m - 1 if max > m - 1
 
-      (min .. max).each do |j|
+      min.upto(max) do |j|
         # If the diagonal value is already greater than the max_distance
         # then we can safety return: the diagonal will never go lower again.
         # See: http://www.levenshtein.net/
@@ -96,11 +103,11 @@ private
         end
 
         cost = s[i] == t[j] ? 0 : 1
-        x = [
-          d[j+1] + 1, # insertion
-          e + 1,      # deletion
-          d[j] + cost # substitution
-        ].min
+        insertion = d[j + 1] + 1
+        deletion = e + 1
+        substitution = d[j] + cost
+        x = insertion < deletion ? insertion : deletion
+        x = substitution if substitution < x
 
         d[j] = e
         e = x
@@ -116,9 +123,12 @@ private
   end
 
   def distance_without_maximum(str1, str2) # :nodoc:
-    s, t = [str1, str2].map{ |str| str.encode(Encoding::UTF_8).unpack("U*") }
+    s = str1.encode(Encoding::UTF_8).unpack("U*")
+    t = str2.encode(Encoding::UTF_8).unpack("U*")
+
     n = s.length
     m = t.length
+
     return m if n.zero?
     return n if m.zero?
 
@@ -128,12 +138,13 @@ private
     n.times do |i|
       e = i + 1
       m.times do |j|
-        cost = (s[i] == t[j]) ? 0 : 1
-        x = [
-          d[j+1] + 1, # insertion
-          e + 1,      # deletion
-          d[j] + cost # substitution
-        ].min
+        cost = s[i] == t[j] ? 0 : 1
+        insertion = d[j + 1] + 1
+        deletion = e + 1
+        substitution = d[j] + cost
+        x = insertion < deletion ? insertion : deletion
+        x = substitution if substitution < x
+
         d[j] = e
         e = x
       end

data/lib/text/version.rb

@@ -2,7 +2,7 @@ module Text
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 3
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/levenshtein_test.rb

@@ -48,6 +48,12 @@ class LevenshteinTest < Test::Unit::TestCase
     assert_equal 3, distance("kitten", "sitting", 4)
   end
 
+  def test_should_return_calculated_distance_when_less_than_maximum_for_empty_strings
+    assert_equal 3, distance("", "cat", 4)
+    assert_equal 3, distance("cat", "", 5)
+    assert_equal 0, distance("", "", 2)
+  end
+
   def test_should_return_calculated_distance_when_same_as_maximum
     assert_equal 0, distance("test", "test", 0)
     assert_equal 1, distance("test", "tent", 1)
@@ -55,12 +61,23 @@ class LevenshteinTest < Test::Unit::TestCase
     assert_equal 3, distance("kitten", "sitting", 3)
   end
 
+  def test_should_return_calculated_distance_when_same_as_maximum_for_empty_strings
+    assert_equal 3, distance("", "cat", 3)
+    assert_equal 3, distance("cat", "", 3)
+    assert_equal 0, distance("", "", 0)
+  end
+
   def test_should_return_specified_maximum_if_distance_is_more
     assert_equal 1, distance("gumbo", "gambol", 1)
     assert_equal 2, distance("kitten", "sitting", 2)
     assert_equal 1, distance("test", "tasf", 1)
   end
 
+  def test_should_return_specified_maximum_if_distance_is_more_for_empty_strings
+    assert_equal 2, distance("kitten", "", 2)
+    assert_equal 3, distance("", "kitten", 3)
+  end
+
   def test_should_return_maximum_distance_for_strings_with_additions_at_start
     assert_equal 1, distance("1234", "01234")
     assert_equal 0, distance("1234", "01234", 0)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: text
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Paul Battley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: text
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A collection of text algorithms