rbbt-dm 1.1.20 → 1.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ce285713356bad8c3fe55c26a2b3ac42f8c782b
-  data.tar.gz: ea8d760c4c2682df56a94c4772a53421d3ae89f7
+  metadata.gz: 97a83dc56c4d061d7b66f23df60a1126052ead53
+  data.tar.gz: fa080e3fdd9d8652d25a1e715908b876ca1ceda5
 SHA512:
-  metadata.gz: 15d49776f790c74e40b7c6c8f44ba320d35e66aff8525cff2ad7f375bec87fb1843fd2775128f6d06e64f37b371a727220d35b9ff0ce52e88b2c49ac8a998718
-  data.tar.gz: 522aa087395221563801e0a2d1a978b2759ad312ba6eea469049b386c44a7198d939f6f05c63aa59dc905b82727384c60e836ad0c4a188377aef7555562a3be2
+  metadata.gz: d8bf54beccad1c846d40f1dedb942471ecde6409b2cdd95945dc3b23bcbf0d56ef61c6768b6f926a55b1db8f081db6821250c2569a4c5db398186c3e04e12bf6
+  data.tar.gz: 41f7461135afef3182422fc7e68f5c00a6040789ea0bd6b716ce886382ba74228467bf2b6061520a2c1842f0ebfa39faeb5f2b7db626dde13dcbb27436ad6065

data/lib/rbbt/matrix/differential.rb

@@ -12,7 +12,7 @@ class Matrix
     name = data_file =~ /:>/ ? File.basename(data_file) : data_file
     main_samples = main_samples & all_samples
     contrast_samples = contrast_samples & all_samples
-    Persist.persist(name, :tsv, :persist => :update, :file => path,
+    Persist.persist(name, :tsv, :persist => true, :file => path,
                     :other => {:main => main_samples, :contrast => contrast_samples}, 
                     :prefix => "Diff", :dir => Matrix.matrix_dir.differential, :no_load => true) do |file|
 

data/lib/rbbt/statistics/fdr.rb

@@ -107,16 +107,26 @@ module FDR
            VALUE new_ary = rb_ary_new();
            VALUE f;
 
-           double p, last = 1;
+           double p,op, last = 1;
 
            for (idx = total - 1; idx >= 0 ; idx-- ){
-             p  = (double) RFLOAT_VALUE(rb_ary_entry(ps, idx));
+             op  = (double) RFLOAT_VALUE(rb_ary_entry(ps, idx));
 
+             if (op < 0){
+               p = -op;
+             }else{
+               p = op;
+             }
 
              p = p * (double) total / (double) (idx + 1);
              if (p > last) p = last;
              last = p;
 
+             if (op < 0){
+               p = -p;
+             }else{
+               p = p;
+             }
              f = rb_float_new(p);
              rb_ary_unshift(new_ary, f);
            }
@@ -157,8 +167,8 @@ module FDR
       }
 
       if RUBY_VERSION[0] == "2"
-        values = FDR.adjust(values)
-        keys.zip(values).each do |k,v|
+        new_values = FDR.adjust(values)
+        keys.zip(new_values).each do |k,v|
           vs = data[k] 
           if field
             vs[field] = v

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-dm
 version: !ruby/object:Gem::Version
-  version: 1.1.20
+  version: 1.1.21
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbbt-util