amatch 0.2.0 → 0.2.1

data/CHANGES

@@ -1,3 +1,6 @@
+2005-09-12 (0.2.1)
+    * Bugfix: Wrong type for pattern length corrected. Thanks to David
+    Heinemeier Hansson for reporting it.
 2005-06-01 (0.2.0)
     * Major changes in API and implementation:
       Now the Levenshtein edit distance, Sellers edit distance, the Hamming

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/ext/amatch.c

@@ -157,7 +157,7 @@ VALUE function(VALUE self, VALUE value)                                 \
 
 typedef struct GeneralStruct {
     char        *pattern;
-    char        pattern_len;
+    int         pattern_len;
 } General;
 
 DEF_ALLOCATOR(General)
@@ -166,7 +166,7 @@ DEF_ITERATE_STRINGS(General)
 
 typedef struct SellersStruct {
     char        *pattern;
-    char        pattern_len;
+    int         pattern_len;
     double      substitution;
     double      deletion;
     double      insertion;
@@ -185,7 +185,7 @@ static void Sellers_reset_weights(Sellers *self)
 
 typedef struct PairDistanceStruct {
     char        *pattern;
-    char        pattern_len;
+    int         pattern_len;
     PairArray   *pattern_pair_array;
 } PairDistance;
 
@@ -694,7 +694,7 @@ static VALUE rb_Levenshtein_similar(VALUE self, VALUE strings)
  */
 static VALUE rb_str_levenshtein_similar(VALUE self, VALUE strings)
 {
-    VALUE amatch = rb_Levenshtein_new(rb_cSellers, self);
+    VALUE amatch = rb_Levenshtein_new(rb_cLevenshtein, self);
     return rb_Levenshtein_similar(amatch, strings);
 }
 
@@ -982,7 +982,7 @@ static VALUE rb_PairDistance_match(int argc, VALUE *argv, VALUE self)
  */
 static VALUE rb_str_pair_distance_similar(VALUE self, VALUE strings)
 {
-    VALUE amatch = rb_PairDistance_new(rb_cSellers, self);
+    VALUE amatch = rb_PairDistance_new(rb_cPairDistance, self);
     return rb_PairDistance_match(1, &strings, amatch);
 }
 
@@ -1133,7 +1133,7 @@ static VALUE rb_LongestSubsequence_similar(VALUE self, VALUE strings)
  */
 static VALUE rb_str_longest_subsequence_similar(VALUE self, VALUE strings)
 {                                                                            
-    VALUE amatch = rb_LongestSubsequence_new(rb_cSellers, self);
+    VALUE amatch = rb_LongestSubsequence_new(rb_cLongestSubsequence, self);
     return rb_LongestSubsequence_similar(amatch, strings);
 }
 
@@ -1211,7 +1211,7 @@ static VALUE rb_LongestSubstring_similar(VALUE self, VALUE strings)
  */
 static VALUE rb_str_longest_substring_similar(VALUE self, VALUE strings)
 {                                                                            
-    VALUE amatch = rb_LongestSubsequence_new(rb_cSellers, self);
+    VALUE amatch = rb_LongestSubstring_new(rb_cLongestSubstring, self);
     return rb_LongestSubstring_similar(amatch, strings);
 }
 

data/tests/test_hamming.rb

@@ -9,6 +9,7 @@ class TC_Hamming < Test::Unit::TestCase
   def setup
     @small   = Hamming.new('test')
     @empty   = Hamming.new('')
+    @long    = Hamming.new('A' * 160)
   end
 
   def test_empty
@@ -50,5 +51,9 @@ class TC_Hamming < Test::Unit::TestCase
     assert_in_delta 0.1, @small.similar('aaatestbbb'), D
     assert_in_delta 0.8, @small.pattern.hamming_similar('testa'), D
   end
+
+  def test_long
+    assert_in_delta 1.0, @long.similar(@long.pattern), D
+  end
 end
   # vim: set et sw=2 ts=2:

data/tests/test_levenshtein.rb

@@ -7,8 +7,9 @@ class TC_Levenshtein < Test::Unit::TestCase
   D = 0.000001
   
   def setup
-    @empty = Levenshtein.new('')
-    @simple = Levenshtein.new('test')
+    @empty    = Levenshtein.new('')
+    @simple   = Levenshtein.new('test')
+    @long     = Levenshtein.new('A' * 160)
   end
 
   def test_match
@@ -70,5 +71,9 @@ class TC_Levenshtein < Test::Unit::TestCase
     assert_in_delta 0.4, @simple.similar('aaatestbbb'), D
     assert_in_delta 0.75, @simple.pattern.levenshtein_similar('est'), D
   end
+
+  def test_long
+    assert_in_delta 1.0, @long.similar(@long.pattern), D
+  end
 end
   # vim: set et sw=2 ts=2:

data/tests/test_longest_subsequence.rb

@@ -9,6 +9,7 @@ class TC_LongestSubsequence < Test::Unit::TestCase
   def setup
     @small   = LongestSubsequence.new('test')
     @empty   = LongestSubsequence.new('')
+    @long    = LongestSubsequence.new('A' * 160)
   end
 
   def test_empty_subsequence
@@ -51,7 +52,11 @@ class TC_LongestSubsequence < Test::Unit::TestCase
     assert_in_delta 0.75, @small.similar('tesa'), D
     assert_in_delta 0.50, @small.similar('taex'), D
     assert_in_delta 0.4, @small.similar('aaatestbbb'), D
-    assert_in_delta 0.75, @small.pattern.levenshtein_similar('est'), D
+    assert_in_delta 0.75, @small.pattern.longest_subsequence_similar('est'), D
+  end
+
+  def test_long
+    assert_in_delta 1.0, @long.similar(@long.pattern), D
   end
 end
   # vim: set et sw=2 ts=2:

data/tests/test_longest_substring.rb

@@ -9,6 +9,7 @@ class TC_LongestSubstring < Test::Unit::TestCase
   def setup
     @small   = LongestSubstring.new('test')
     @empty   = LongestSubstring.new('')
+    @long    = LongestSubstring.new('A' * 160)
   end
 
   def test_empty_substring
@@ -51,7 +52,11 @@ class TC_LongestSubstring < Test::Unit::TestCase
     assert_in_delta 0.75, @small.similar('tesa'), D
     assert_in_delta 0.25, @small.similar('taex'), D
     assert_in_delta 0.4, @small.similar('aaatestbbb'), D
-    assert_in_delta 0.75, @small.pattern.levenshtein_similar('est'), D
+    assert_in_delta 0.75, @small.pattern.longest_substring_similar('est'), D
+  end
+
+  def test_long
+    assert_in_delta 1.0, @long.similar(@long.pattern), D
   end
 end
   # vim: set et sw=2 ts=2:

data/tests/test_pair_distance.rb

@@ -12,6 +12,7 @@ class TC_PairDistance < Test::Unit::TestCase
     @france   = PairDistance.new('republic of france')
     @germany  = PairDistance.new('federal republic of germany')
     @csv      = PairDistance.new('foo,bar,baz')
+    @long     = PairDistance.new('A' * 160)
   end
 
   def test_empty
@@ -53,6 +54,7 @@ class TC_PairDistance < Test::Unit::TestCase
     assert_in_delta 0.6,        @single.match('aaa test bbb'), D
     assert_in_delta 0.6,        @single.match('test aaa bbb'), D
     assert_in_delta 0.6,        @single.match('bbb aaa test'), D
+    assert_in_delta 0.8571428,  @single.pattern.pair_distance_similar('atest'), D
   end
 
   def test_csv
@@ -77,5 +79,9 @@ class TC_PairDistance < Test::Unit::TestCase
     assert_in_delta 0.9,        @csv.match('foo,baz,bar'), D
     assert_in_delta 0.9,        @csv.similar('foo,baz,bar'), D
   end
+
+  def test_long
+    assert_in_delta 1.0, @long.similar(@long.pattern), D
+  end
 end
   # vim: set et sw=2 ts=2:

data/tests/test_sellers.rb

@@ -8,8 +8,9 @@ class TC_Sellers < TC_Levenshtein
   D = 0.000001
 
   def setup
-    @empty = Sellers.new('')
-    @simple = Sellers.new('test')
+    @empty    = Sellers.new('')
+    @simple   = Sellers.new('test')
+    @long     = Sellers.new('A' * 160)
   end
 
   def test_weights
@@ -85,10 +86,13 @@ class TC_Sellers < TC_Levenshtein
     assert_in_delta 0.75, @simple.similar('tesa'), D
     assert_in_delta 0.25, @simple.similar('taex'), D
     assert_in_delta 0.4, @simple.similar('aaatestbbb'), D
-    assert_in_delta 0.75, @simple.pattern.levenshtein_similar('est'), D
     @simple.insertion = 1
     @simple.substitution = @simple.deletion = 2
     assert_in_delta 0.875, @simple.similar('tst'), D
   end
+
+  def test_long
+    assert_in_delta 1.0, @long.similar(@long.pattern), D
+  end
 end
   # vim: set et sw=2 ts=2:

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+rubygems_version: 0.8.11
 specification_version: 1
 name: amatch
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2005-06-01
+  version: 0.2.1
+date: 2005-09-12 00:00:00 +02:00
 summary: Approximate String Matching library
 require_paths: 
   - ext
@@ -26,6 +26,8 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
   - Florian Frank
 files: 
@@ -33,28 +35,24 @@ files:
   - CHANGES
   - GPL
   - bin
-  - bin/agrep.rb
+  - Rakefile
+  - VERSION
+  - install.rb
   - ext
+  - tests
+  - bin/agrep.rb
   - ext/MANIFEST
   - ext/amatch.c
   - ext/extconf.rb
-  - ext/amatch.bundle
-  - ext/tags
-  - ext/pair.h
   - ext/pair.c
-  - Rakefile
-  - VERSION
-  - install.rb
-  - config.save
-  - InstalledFiles
-  - tests
-  - tests/test_levenshtein.rb
-  - tests/test_hamming.rb
-  - tests/test_pair_distance.rb
+  - ext/pair.h
   - tests/runner.rb
-  - tests/test_sellers.rb
+  - tests/test_hamming.rb
+  - tests/test_levenshtein.rb
   - tests/test_longest_subsequence.rb
   - tests/test_longest_substring.rb
+  - tests/test_pair_distance.rb
+  - tests/test_sellers.rb
 test_files: 
   - tests/runner.rb
 rdoc_options: 

data/InstalledFiles

@@ -1,5 +0,0 @@
-/usr/local/stow/ruby/bin/
-/usr/local/stow/ruby/bin/CVS
-/usr/local/stow/ruby/bin/CVS
-/usr/local/stow/ruby/bin/CVS
-/usr/local/stow/ruby/lib/ruby/site_ruby/1.8/i686-linux/.

data/config.save

@@ -1,12 +0,0 @@
-bin-dir=$prefix/bin
-site-ruby=$prefix/lib/ruby/site_ruby/1.8
-prefix=/usr/local/stow/ruby
-ruby-path=/usr/local/stow/ruby/bin/ruby
-make-prog=make
-rb-dir=$site-ruby
-without-ext=no
-ruby-prog=/usr/local/stow/ruby/bin/ruby
-site-ruby-common=$prefix/lib/ruby/site_ruby
-std-ruby=$prefix/lib/ruby/1.8
-data-dir=$prefix/share
-so-dir=$prefix/lib/ruby/site_ruby/1.8/i686-linux

data/ext/tags

@@ -1,24 +0,0 @@
-CAST2FLOAT	amatch.c	/^#define CAST2FLOAT(obj) \\$/
-DEF_ALLOCATOR	amatch.c	/^#define DEF_ALLOCATOR(type)                       /
-DEF_CONSTRUCTOR	amatch.c	/^#define DEF_CONSTRUCTOR(klass, type)              /
-DEF_ITERATE_STRINGS	amatch.c	/^#define DEF_ITERATE_STRINGS(type)                 /
-DEF_PATTERN_ACCESSOR	amatch.c	/^#define DEF_PATTERN_ACCESSOR(type)                /
-DEF_RB_FREE	amatch.c	/^#define DEF_RB_FREE(klass, type)                  /
-DEF_RB_READER	amatch.c	/^#define DEF_RB_READER(type, function, name, conver/
-DEF_RB_WRITER	amatch.c	/^#define DEF_RB_WRITER(type, function, name, vtype,/
-FLOAT2C	amatch.c	/^#define FLOAT2C(obj) RFLOAT(obj)->value$/
-GET_STRUCT	amatch.c	/^#define GET_STRUCT(klass)                 \\$/
-Init_amatch	amatch.c	/^void Init_amatch()$/
-Levenshtein_search	amatch.c	/^static VALUE Levenshtein_search(Levenshtein *amatc/
-PairDistance_match	amatch.c	/^static VALUE PairDistance_match($/
-amatch_LongestSubstring	amatch.c	/^static VALUE amatch_LongestSubstring(General *amat/
-hamming	amatch.c	/^static VALUE hamming(General *amatch, VALUE string/
-longest_subsequence	amatch.c	/^static VALUE longest_subsequence(General *amatch, /
-rb_Levenshtein_initialize	amatch.c	/^static VALUE rb_Levenshtein_initialize(VALUE self,/
-rb_Levenshtein_search	amatch.c	/^static VALUE rb_Levenshtein_search(VALUE self, VAL/
-rb_str_Levenshtein_match	amatch.c	/^static VALUE rb_str_Levenshtein_match(VALUE self, /
-rb_str_Levenshtein_search	amatch.c	/^static VALUE rb_str_Levenshtein_search(VALUE self,/
-rb_str_hamming	amatch.c	/^static VALUE rb_str_hamming(VALUE self, VALUE stri/
-rb_str_longest_subsequence	amatch.c	/^static VALUE rb_str_longest_subsequence(VALUE self/
-rb_str_longest_substring	amatch.c	/^static VALUE rb_str_longest_substring(VALUE self, /
-rb_str_pair_distance	amatch.c	/^static VALUE rb_str_pair_distance(VALUE self, VALU/