taxamatch_rb 0.6.0 → 0.6.1

data/lib/taxamatch_rb.rb

@@ -48,14 +48,14 @@ module Taxamatch
     def match_multinomial(preparsed_1, preparsed_2)
       gen_match = match_genera(preparsed_1[:genus], preparsed_2[:genus])
       sp_match = match_species(preparsed_1[:species], preparsed_2[:species])
-      total_length = preparsed_1[:genus][:epitheton].size + preparsed_2[:genus][:epitheton].size + preparsed_1[:species][:epitheton].size + preparsed_2[:species][:epitheton].size
+      total_length = preparsed_1[:genus][:string].size + preparsed_2[:genus][:string].size + preparsed_1[:species][:string].size + preparsed_2[:species][:string].size
       if preparsed_1[:infraspecies] && preparsed_2[:infraspecies]
         infrasp_match = match_species(preparsed_1[:infraspecies][0], preparsed_2[:infraspecies][0])
-        total_length += preparsed_1[:infraspecies][0][:epitheton].size + preparsed_2[:infraspecies][0][:epitheton].size
+        total_length += preparsed_1[:infraspecies][0][:string].size + preparsed_2[:infraspecies][0][:string].size
         match_hash = match_matches(gen_match, sp_match, infrasp_match)
       elsif (preparsed_1[:infraspecies] && !preparsed_2[:infraspecies]) || (!preparsed_1[:infraspecies] && preparsed_2[:infraspecies])
         match_hash = { 'match' => false, 'edit_distance' => 5, 'phonetic_match' => false }
-        total_length += preparsed_1[:infraspecies] ? preparsed_1[:infraspecies][0][:epitheton].size : preparsed_2[:infraspecies][0][:epitheton].size 
+        total_length += preparsed_1[:infraspecies] ? preparsed_1[:infraspecies][0][:string].size : preparsed_2[:infraspecies][0][:string].size 
       else
         match_hash = match_matches(gen_match, sp_match)
       end

data/lib/taxamatch_rb/atomizer.rb

@@ -38,9 +38,9 @@ module Taxamatch
     def process_node(name, node, is_species = false)
       return unless node
       @res[name] = {}
-      @res[name][:epitheton] = node[:epitheton]
-      @res[name][:normalized] = Taxamatch::Normalizer.normalize(node[:epitheton])
-      @res[name][:phonetized] = Taxamatch::Phonetizer.near_match(node[:epitheton], is_species)
+      @res[name][:string] = node[:string]
+      @res[name][:normalized] = Taxamatch::Normalizer.normalize(node[:string])
+      @res[name][:phonetized] = Taxamatch::Phonetizer.near_match(node[:string], is_species)
       get_authors_years(node, @res[name])
     end
   
@@ -49,9 +49,9 @@ module Taxamatch
       @res[:infraspecies] = []
       node.each do |infr|
         hsh = {}
-        hsh[:epitheton] = infr[:epitheton]
-        hsh[:normalized] = Taxamatch::Normalizer.normalize(infr[:epitheton])
-        hsh[:phonetized] = Taxamatch::Phonetizer.near_match(infr[:epitheton], true)
+        hsh[:string] = infr[:string]
+        hsh[:normalized] = Taxamatch::Normalizer.normalize(infr[:string])
+        hsh[:phonetized] = Taxamatch::Phonetizer.near_match(infr[:string], true)
         get_authors_years(infr,hsh)
         @res[:infraspecies] << hsh
       end

data/spec/spec_helper.rb

@@ -24,5 +24,5 @@ end
 
 def make_taxamatch_hash(string)
   normalized = Taxamatch::Normalizer.normalize(string)
-  {:epitheton => string, :normalized => normalized, :phonetized => Taxamatch::Phonetizer.near_match(normalized)}
-end
+  {:string => string, :normalized => normalized, :phonetized => Taxamatch::Phonetizer.near_match(normalized)}
+end

data/spec/taxamatch_rb_spec.rb

@@ -7,7 +7,7 @@ describe 'DamerauLevenshteinMod' do
       dl = Taxamatch::DamerauLevenshteinMod.new
       if y
         res = dl.distance(y[0], y[1], y[3].to_i, y[2].to_i)
-        puts y if res != y[4].to_i
+        #puts y if res != y[4].to_i
         res.should == y[4].to_i
       end
     end
@@ -20,16 +20,16 @@ describe 'Atomizer' do
   end
   
   it 'should parse uninomials' do
-    @parser.parse('Betula').should == {:all_authors=>[], :all_years=>[], :uninomial=>{:epitheton=>"Betula", :normalized=>"BETULA", :phonetized=>"BITILA", :authors=>[], :years=>[], :normalized_authors=>[]}}
-    @parser.parse('Ærenea Lacordaire, 1872').should == {:all_authors=>["LACORDAIRE"], :all_years=>["1872"], :uninomial=>{:epitheton=>"Aerenea", :normalized=>"AERENEA", :phonetized=>"ERINIA", :authors=>["Lacordaire"], :years=>["1872"], :normalized_authors=>["LACORDAIRE"]}}
+    @parser.parse('Betula').should == {:all_authors=>[], :all_years=>[], :uninomial=>{:string=>"Betula", :normalized=>"BETULA", :phonetized=>"BITILA", :authors=>[], :years=>[], :normalized_authors=>[]}}
+    @parser.parse('Ærenea Lacordaire, 1872').should == {:all_authors=>["LACORDAIRE"], :all_years=>["1872"], :uninomial=>{:string=>"Aerenea", :normalized=>"AERENEA", :phonetized=>"ERINIA", :authors=>["Lacordaire"], :years=>["1872"], :normalized_authors=>["LACORDAIRE"]}}
   end
   
   it 'should parse binomials' do
-    @parser.parse('Leœptura laetifica Dow, 1913').should == {:all_authors=>["DOW"], :all_years=>["1913"], :genus=>{:epitheton=>"Leoeptura", :normalized=>"LEOEPTURA", :phonetized=>"LIPTIRA", :authors=>[], :years=>[], :normalized_authors=>[]}, :species=>{:epitheton=>"laetifica", :normalized=>"LAETIFICA", :phonetized=>"LITIFICA", :authors=>["Dow"], :years=>["1913"], :normalized_authors=>["DOW"]}}
+    @parser.parse('Leœptura laetifica Dow, 1913').should == {:all_authors=>["DOW"], :all_years=>["1913"], :genus=>{:string=>"Leoeptura", :normalized=>"LEOEPTURA", :phonetized=>"LIPTIRA", :authors=>[], :years=>[], :normalized_authors=>[]}, :species=>{:string=>"laetifica", :normalized=>"LAETIFICA", :phonetized=>"LITIFICA", :authors=>["Dow"], :years=>["1913"], :normalized_authors=>["DOW"]}}
   end
   
   it 'should parse trinomials' do 
-    @parser.parse('Hydnellum scrobiculatum zonatum (Banker) D. Hall et D.E. Stuntz 1972').should == {:all_authors=>["BANKER", "D HALL", "D E STUNTZ"], :all_years=>["1972"], :genus=>{:epitheton=>"Hydnellum", :normalized=>"HYDNELLUM", :phonetized=>"HIDNILIM", :authors=>[], :years=>[], :normalized_authors=>[]}, :species=>{:epitheton=>"scrobiculatum", :normalized=>"SCROBICULATUM", :phonetized=>"SCRABICILATA", :authors=>[], :years=>[], :normalized_authors=>[]}, :infraspecies=>[{:epitheton=>"zonatum", :normalized=>"ZONATUM", :phonetized=>"ZANATA", :authors=>["Banker", "D. Hall", "D.E. Stuntz"], :years=>["1972"], :normalized_authors=>["BANKER", "D HALL", "D E STUNTZ"]}]}
+    @parser.parse('Hydnellum scrobiculatum zonatum (Banker) D. Hall et D.E. Stuntz 1972').should == {:all_authors=>["BANKER", "D HALL", "D E STUNTZ"], :all_years=>["1972"], :genus=>{:string=>"Hydnellum", :normalized=>"HYDNELLUM", :phonetized=>"HIDNILIM", :authors=>[], :years=>[], :normalized_authors=>[]}, :species=>{:string=>"scrobiculatum", :normalized=>"SCROBICULATUM", :phonetized=>"SCRABICILATA", :authors=>[], :years=>[], :normalized_authors=>[]}, :infraspecies=>[{:string=>"zonatum", :normalized=>"ZONATUM", :phonetized=>"ZANATA", :authors=>["Banker", "D. Hall", "D.E. Stuntz"], :years=>["1972"], :normalized_authors=>["BANKER", "D HALL", "D E STUNTZ"]}]}
   end
 end
 
@@ -59,7 +59,7 @@ describe 'Taxamatch::Base' do
       if y
         y[2] = y[2] == 'true' ? true : false
         res = @tm.taxamatch(y[0], y[1], false)
-        puts "%s, %s, %s, %s" % [y[0], y[1], y[2], y[3]] 
+        #puts "%s, %s, %s, %s" % [y[0], y[1], y[2], y[3]] 
         res['match'].should == y[2]
         res['edit_distance'].should == y[3].to_i
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Dmitry Mozzherin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-19 00:00:00 -04:00
+date: 2010-03-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency