loose_tight_dictionary 0.1.0 → 0.1.1

data/benchmark/memory.rb

@@ -47,7 +47,7 @@ FINAL_OPTIONS = {
 Memprof.start
 
 d = LooseTightDictionary.new HAYSTACK, FINAL_OPTIONS
-record = d.find('boeing 707(100)', false)
+record = d.find('boeing 707(100)', :gather_last_result => false)
 # d.free
 
 Memprof.stats

data/lib/loose_tight_dictionary.rb

@@ -42,17 +42,21 @@ class LooseTightDictionary
   def log(str = '') #:nodoc:
     (options[:log] || $stderr).puts str unless options[:log] == false
   end
-  
-  def find_with_score(needle)
-    record = find needle
-    [ record, last_result.score ]
+    
+  def find_all(needle, options = {})
+    options = options.symbolize_keys.merge(:find_all => true)
+    find needle, options
   end
   
   # todo fix record.record confusion (should be wrapper.record or smth)
-  def find(needle, gather_last_result = true)
+  def find(needle, options = {})
     raise Freed if freed?
     free_last_result
     
+    options = options.symbolize_keys
+    gather_last_result = options.fetch(:gather_last_result, true)
+    find_all = options.fetch(:find_all, false)
+    
     if gather_last_result
       last_result.tighteners = tighteners
       last_result.identities = identities
@@ -65,7 +69,13 @@ class LooseTightDictionary
       last_result.needle = needle
     end
     
-    return if strict_blocking and blockings.none? { |blocking| blocking.encompass? needle }
+    if strict_blocking and blockings.none? { |blocking| blocking.encompass? needle }
+      if find_all
+        return []
+      else
+        return nil
+      end
+    end
 
     encompassed, unencompassed = if strict_blocking and blockings.any?
       haystack.partition do |record|
@@ -98,6 +108,10 @@ class LooseTightDictionary
       last_result.certainly_different = certainly_different
     end
     
+    if find_all
+      return possibly_identical.map { |record| record.record }
+    end
+    
     similarities = possibly_identical.map do |record|
       needle.similarity record
     end.sort

data/lib/loose_tight_dictionary/version.rb

@@ -1,3 +1,3 @@
 class LooseTightDictionary
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/test/test_loose_tight_dictionary.rb

@@ -17,7 +17,8 @@ class TestLooseTightDictionary < Test::Unit::TestCase
   
   def test_002_find_with_score
     d = LooseTightDictionary.new %w{ NISSAN HONDA }
-    assert_equal ['NISSAN', 0.6], d.find_with_score('MISSAM')
+    assert_equal 'NISSAN', d.find('MISSAM')
+    assert_equal 0.6, d.last_result.score
   end
   
   def test_003_last_result
@@ -75,4 +76,10 @@ class TestLooseTightDictionary < Test::Unit::TestCase
       d.find('foobar')
     end
   end
+  
+  def test_012_find_all
+    d = LooseTightDictionary.new [ 'X', 'X22', 'Y', 'Y4' ], :blockings => [ /X/, /Y/ ], :strict_blocking => true
+    assert_equal ['X', 'X22' ], d.find_all('X')
+    assert_equal [], d.find_all('A')
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: loose_tight_dictionary
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Seamus Abshere