rbbt-dm 1.1.10 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cebd878c8fec27417cedaa984d8d69ae441a7ec7
-  data.tar.gz: 1151c47e6ab709aae84eb91aeb3d67f0ecc13a8c
+  metadata.gz: ff393dd8bd60192463ea80db606bd63dd5390575
+  data.tar.gz: 570d6480780695d03275bfa336bcaf5287fccd71
 SHA512:
-  metadata.gz: 422afbdb72b1e5905f98842834a914cfdad25e2544ee9dc4563156a8fd2b914b1f7235f71d5bb13d000db99aa41f6d498dc93314293da45c4086f654898940f5
-  data.tar.gz: 9b17d016953a36075d13d898d653483072c0ea943f00527495335732127dfcc216d2886f8013f79695de543a9541bf585cfced131294f312a9d23719ec09171a
+  metadata.gz: 838f210c4c4bb1cf605e99d8dd2c2942eb2aff5198681017db7d745a3081a6d6a94752b94d42762a973001b945d6049a8191b48cac846662cfd87a9462400e8c
+  data.tar.gz: 4c2ad52302eb86a1301429bb5806a45c6b842d2f0bd0bcfe75e9058390b04b07911e5711c284d670bcf85169adcf88193ad448b30fc4207493be26042da382a1

data/lib/rbbt/statistics/hypergeometric.rb

@@ -115,6 +115,7 @@ module TSV
     fields = [fields] if String === fields or Symbol === fields
     rename = options.delete :rename
 
+    field_pos = fields.collect{|f| self.fields.index f}.compact
     persistence_path = self.respond_to?(:persistence_path)? self.persistence_path : nil
     Persist.persist(filename, :yaml, :fields => fields, :persist => persistence, :prefix => "Hyp.Geo.Counts", :other => {:rename => rename, :persistence_path => persistence_path}) do 
       data ||= {}
@@ -123,22 +124,22 @@ module TSV
 
         case type
         when :single
-          through :key, fields do |key, value|
+          through :key, field_pos do |key, value|
             next if value.nil? 
             data[value] ||= []
             data[value] << key
           end
         when :double
-          through :key, fields do |key, values|
+          through :key, field_pos do |key, values|
             values.flatten.compact.uniq.each{|value| data[value] ||= []; data[value] << key}
           end
         when :list
-          through :key, fields do |key, values|
+          through :key, field_pos do |key, values|
             next if values.nil?
             values.compact.uniq.each{|value| data[value] ||= []; data[value] << key}
           end
         when :flat
-          through :key, fields do |key, values|
+          through :key, field_pos do |key, values|
             next if values.nil?
             values.compact.uniq.each{|value| data[value] ||= []; data[value] << key}
           end
@@ -234,7 +235,6 @@ module TSV
             }
           end
         end
-
       end
 
       if Array === background and not background.empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-dm
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbbt-util