rbbt-dm 1.1.14 → 1.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2b26e9957f7e161566093695ef9e6041be4e074
-  data.tar.gz: 16e52936efa8d8a8a80a998caf6d6f9b498600aa
+  metadata.gz: e12a29723724a2bd6511751389ba939a9812d268
+  data.tar.gz: 8aa95f36ff74ec63e1880817a58d35474ae7b43e
 SHA512:
-  metadata.gz: 1ccf87c9524a4280fd691501ad6375d9375a2f0fb9e1ffa49221a3c891e1606670fa9f5d2a0e506144717e37bb1935febb505b858f330b1161df332ce2957b0c
-  data.tar.gz: 9ef1e9c5e5fb08e4cfdec45605d1ad6e1745b8ad4e0a9d685cbf78d2cb6c04895b54be1f4588f18b709d86b2a039176bc2a6de24a0fb1684656b19c7a2d9f350
+  metadata.gz: d6d65757c611cbacebbc3450404cdf606d800e261e949bab813a4f5beffe825fce270aa554ffba49df58c2baceae680f908041e8821ec93a5e8eded6bd61ba14
+  data.tar.gz: 3b797b984c2c7e6b89fd005a0861dbff432a7bc6460bb812b8e3801d5a268f3fdf068d39256a6d414e2d79dc8848bf56d9c6d01faa917f480af339a27bd62fa5

data/lib/rbbt/matrix/differential.rb

@@ -2,6 +2,7 @@ require 'rbbt/util/R'
 
 class Matrix
   def differential(main, contrast, path = nil)
+    all_samples = self.samples
     if Array === main and Array === contrast
       main_samples, contrast_samples = main, contrast
     else
@@ -9,6 +10,8 @@ class Matrix
     end
 
     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,
                     :other => {:main => main_samples, :contrast => contrast_samples}, 
                     :prefix => "Diff", :dir => Matrix.matrix_dir.differential, :no_load => true) do |file|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-dm
 version: !ruby/object:Gem::Version
-  version: 1.1.14
+  version: 1.1.15
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbbt-util