fuzz_ball 0.9.0 → 0.9.1

data/ext/fuzz_ball/duple_index/DupleIndex.c

@@ -223,7 +223,7 @@ VALUE method_match(VALUE self, VALUE needle) {
            * duple to match since it appears before 'ab' in the indexed string,
            * whereas it appears after in the needle string.
            */
-          if ((match->last_matched_position < pos->pos) && (match->last_matched_ca != c_a) && (match->last_matched_cb != c_b)) {
+          if ((match->last_matched_position < pos->pos)) { // && (match->last_matched_ca != c_a) && (match->last_matched_cb != c_b)) {
             update_match( match, pos->pos, c_a, c_b );
           }
         }
@@ -268,7 +268,13 @@ struct match *create_match(int id, int pos, int c_a, int c_b) {
 }
 
 void update_match(struct match* match, int pos, int c_a, int c_b) {
-  match->n_matches++;
+
+  if (match->last_matched_position == pos-1) {
+    match->n_matches += 2;
+  } else {
+    match->n_matches++;
+  }
+
   match->last_matched_position = pos;
   match->last_matched_ca       = c_a;
   match->last_matched_cb       = c_b;

data/lib/fuzz_ball.rb

@@ -2,5 +2,7 @@ require 'fuzz_ball/smith_waterman'
 require 'fuzz_ball/duple_index'
 
 module FuzzBall
+  VERSION = "0.9.1"
+
   autoload :Searcher, 'fuzz_ball/searcher'
 end

data/lib/fuzz_ball/searcher.rb

@@ -8,7 +8,7 @@ module FuzzBall
       @files       = files
       @files_array = files.collect {|f| str2arr(f)}
 
-			index_duples!
+      index_duples!
     end
 
     def add( str )
@@ -56,19 +56,20 @@ module FuzzBall
 
     private
 
-		def index_duples!
-			@duple_index = DupleIndex.new
-			files_array.each_with_index do |str, index|
-				duple_index.add(index, str)
-			end
-		end
+    def index_duples!
+      @duple_index = DupleIndex.new
+      files_array.each_with_index do |str, index|
+        duple_index.add(index, str)
+      end
+    end
 
     def decimate_strings!(needle)
-			matches_by_score = duple_index.match(needle)
-			max_score        = matches_by_score.keys.max
-			indices          = matches_by_score[max_score]
+      matches_by_score = duple_index.match(needle)
+
+      max_keys = matches_by_score.keys.sort.last(2)
+      indices  = matches_by_score.values_at(*max_keys).flatten
 
-			files_array.values_at(*indices)
+      files_array.values_at(*indices)
     end
 
     def str2arr( str )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuzz_ball
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-05 00:00:00.000000000 -07:00
+date: 2011-10-20 00:00:00.000000000 -07:00
 default_executable: 
 dependencies: []
 description: ! 'FuzzBall is a gem that finds fuzzy matches of a string (the ''needle'')