damerau-levenshtein 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f1db3c601f8dd29e5470deedecee3e99ee84f71
-  data.tar.gz: dc320d3f50452e226beba347b0711f78c85e1595
+  metadata.gz: acbd86c82aab23d17130fda4d7e05aa39d10571d
+  data.tar.gz: 8421eaf8a995a2b217ca77a703b0ac328a729202
 SHA512:
-  metadata.gz: 5231e78a77dbc0f91fd790dab046099d5952649f895d2d418ae83fc8f4d610ffe55aa025f493bba494719c5886e76b67a954b7d22beb6a11bd9aa9c004526a53
-  data.tar.gz: 7e885987bd0b063145fbb04e31bc6a8474e2957d65abf7d877a08f2335e4527b396696f24e2a6d495a51d0d24ceac841971ba91381f2ceb11460f2ece41e660b
+  metadata.gz: 3ad4824365414744893442e7c64698f9c0bd0ca4b948b52d53b55f107a89fc5e96971e1bf81ac50a051ed63bf68dcb33493e08af96fbe16aa9d10bd030b0cae6
+  data.tar.gz: e1e72f50b29be357115bdf666bb7c7a57c9b88bd1eecf0457d25dba469ebe20cdd65e8b4b58c153d947041ff2dd5f2593743787257bd575d4689416a31065ee3

data/CHANGELOG.md

@@ -1,7 +1,9 @@
 damerau-levenshtein CHANGELOG
 =============================
 
-1.2.3 -- add ruby 2.3.1 to travis tests by request from @greysteil
+1.2.0 -- add edit distance for array of integers (by @azhi)
+
+1.1.3 -- add ruby 2.3.1 to travis tests by request from @greysteil
 
 1.1.2 -- remove unnecessary production dependencies (by @ixti)
 

data/README.md

@@ -13,7 +13,7 @@ This gem implements pure Levenshtein algorithm, Damerau modification of it
 (where 2 character transposition counts as 1 edit distance). It also includes
 Boehmer & Rees 2008 modification of Damerau algorithm, where transposition
 of bigger than 1 character blocks is taken in account as well
-(Boehmer & Rees 2008).
+[(Rees 2014)][rees2014].
 
 ```ruby
 require "damerau-levenshtein"
@@ -82,10 +82,10 @@ DamerauLevenshtein.distance(string1, string2, block_size, max_distance)
 
 DamerauLevenshtein.distance takes 4 arguments:
 
-* string1
-* string2
-* block_size (default is 1)
-* max_distance (default is 10)
+* `string1`
+* `string2`
+* `block_size` (default is 1)
+* `max_distance` (default is 10)
 
 `block_size` determines maximum number of characters in a transposition block:
 
@@ -117,6 +117,17 @@ DamerauLevenshtein.distance("abcdefg", "1234567", 0, 3)
 # output: 4 -- it gave up when edit distance exceeded 3
 ```
 
+`DamerauLevenshtein.string_distance` is an alias of
+`DamerauLevenshtein.distance`
+
+`DamerauLevenshtein.array_distance` has the same parameters as
+`DamerauLevenshtein.distance`, but operates on arrays of Integers.
+
+```ruby
+DamerauLevenshtein.array_distance([1,2,4], [1,2,3])
+# output: 1
+```
+
 Contributing to damerau-levenshtein
 -----------------------------------
 
@@ -146,7 +157,8 @@ Authors
 Contributors
 ------------
 
-[lazylester][lazylester], [Ran Xie][skarlit], [Alexey Zapparov][ixti]
+[lazylester][lazylester], [Ran Xie][skarlit], [Alexey Zapparov][ixti],
+[azhi][azhi]
 
 Copyright
 ---------
@@ -168,3 +180,5 @@ further details.
 [lazylester]: https://github.com/lazylester
 [skarlit]: https://github.com/Skarlit
 [ixti]: https://github.com/ixti
+[azhi]: https://github.com/azhi
+[rees2014]: https://dx.doi.org/10.1371/journal.pone.0107510

data/damerau-levenshtein.gemspec

@@ -15,21 +15,22 @@ Gem::Specification.new do |s|
                   "Damerau modification (where 2 character " \
                   "transposition counts as 1 edit distance). It also " \
                   "includes Boehmer & Rees 2008 modification, " \
-                  "to handle transposition in bloks with more than " \
+                  "to handle transposition in blocks with more than " \
                   "2 characters (Boehmer & Rees 2008)."
   s.files = `git ls-files -z`.split("\x0").
             reject { |f| f.match(%r{^(test|spec|features)/}) }
   s.extensions = ["ext/damerau_levenshtein/extconf.rb"]
   s.require_paths = ["lib", "lib/damerau-levenshtein"]
 
-  s.add_development_dependency "rspec", "~> 3.4"
+  s.add_development_dependency "rspec", "~> 3.5"
+  # activesupport >= 5.0 does not support Ruby < 2.2
   s.add_development_dependency "activesupport", "~> 4.2"
-  s.add_development_dependency "cucumber", "~> 2.3"
+  s.add_development_dependency "cucumber", "~> 2.4"
   s.add_development_dependency "ruby-prof", "~> 0.15"
   s.add_development_dependency "shoulda", "~> 3.5"
-  s.add_development_dependency "rubocop", "~> 0.38"
+  s.add_development_dependency "rubocop", "~> 0.41"
   s.add_development_dependency "coveralls", "~> 0.8"
   s.add_development_dependency "bundler", "~> 1.11"
-  s.add_development_dependency "rake", "~> 11.1"
-  s.add_development_dependency "rake-compiler", "~> 0.9"
+  s.add_development_dependency "rake", "~> 11.2"
+  s.add_development_dependency "rake-compiler", "~> 1.0"
 end

data/ext/damerau_levenshtein/damerau_levenshtein.c

@@ -4,14 +4,14 @@ VALUE DamerauLevenshteinBinding = Qnil;
 
 void Init_damerau_levenshtein();
 
-VALUE method_distance_utf(VALUE self, VALUE _s, VALUE _t, VALUE _block_size, VALUE _max_distance);
+VALUE method_internal_distance(VALUE self, VALUE _s, VALUE _t, VALUE _block_size, VALUE _max_distance);
 
 void Init_damerau_levenshtein() {
 	DamerauLevenshteinBinding = rb_define_module("DamerauLevenshteinBinding");
-	rb_define_method(DamerauLevenshteinBinding, "distance_utf", method_distance_utf, 4);
+	rb_define_method(DamerauLevenshteinBinding, "internal_distance", method_internal_distance, 4);
 }
 
-VALUE method_distance_utf(VALUE self, VALUE _s, VALUE _t, VALUE _block_size, VALUE _max_distance){
+VALUE method_internal_distance(VALUE self, VALUE _s, VALUE _t, VALUE _block_size, VALUE _max_distance){
   VALUE *sv = RARRAY_PTR(_s);
   VALUE *tv = RARRAY_PTR(_t);
   int i, i1, j, j1, k, half_tl, cost, *d, distance, del, ins, subs, transp, block;
@@ -24,8 +24,8 @@ VALUE method_distance_utf(VALUE self, VALUE _s, VALUE _t, VALUE _block_size, VAL
   int max_distance = NUM2INT(_max_distance);
   int sl = (int) RARRAY_LEN(_s);
   int tl = (int) RARRAY_LEN(_t);
-  int s[sl];
-  int t[tl];
+  long long s[sl];
+  long long t[tl];
   
   if (block_size == 0) {
     pure_levenshtein = 1;
@@ -39,8 +39,8 @@ VALUE method_distance_utf(VALUE self, VALUE _s, VALUE _t, VALUE _block_size, VAL
   if (sl == 1 && tl == 1 && sv[0] != tv[0]) return INT2NUM(1);
 
 
-  for (i=0; i < sl; i++) s[i] = NUM2INT(sv[i]);
-  for (i=0; i < tl; i++) t[i] = NUM2INT(tv[i]);
+  for (i=0; i < sl; i++) s[i] = NUM2LL(sv[i]);
+  for (i=0; i < tl; i++) t[i] = NUM2LL(tv[i]);
 
   sl++;
   tl++;

data/lib/damerau-levenshtein.rb

@@ -12,6 +12,23 @@ module DamerauLevenshtein
   end
 
   def self.distance(str1, str2, block_size = 1, max_distance = 10)
-    distance_utf(str1.unpack("U*"), str2.unpack("U*"), block_size, max_distance)
+    internal_distance(
+      str1.unpack("U*"), str2.unpack("U*"),
+      block_size, max_distance
+    )
+  end
+
+  def self.string_distance(*args)
+    distance(*args)
+  end
+
+  def self.array_distance(array1, array2, block_size = 1, max_distance = 10)
+    internal_distance(array1, array2, block_size, max_distance)
+  end
+
+  # keep backward compatibility - internal_distance was called distance_utf
+  # before
+  def self.distance_utf(*args)
+    internal_distance(*args)
   end
 end

data/lib/damerau-levenshtein/version.rb

@@ -1,4 +1,4 @@
 # Damerau Levenshtein algorithm
 module DamerauLevenshtein
-  VERSION = "1.1.3".freeze
+  VERSION = "1.2.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: damerau-levenshtein
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Dmitry Mozzherin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '0.41'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '0.41'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -128,31 +128,31 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '11.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '11.2'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 description: This gem implements pure Levenshtein algorithm, Damerau modification
   (where 2 character transposition counts as 1 edit distance). It also includes Boehmer
-  & Rees 2008 modification, to handle transposition in bloks with more than 2 characters
+  & Rees 2008 modification, to handle transposition in blocks with more than 2 characters
   (Boehmer & Rees 2008).
 email: dmozzherin@gmail.com
 executables: []