rbbt-dm 1.1.24 → 1.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d11d8ef4665bf67cfb366e8d4d09cf4c15ab071
-  data.tar.gz: 0fcbe23b5740ff83c7f82982720e836628bd0634
+  metadata.gz: 94d4fbd7b7ffddd81c3c6dd24485a15b1e420134
+  data.tar.gz: 94f9901bce9948cb345674a4a49241b6d33a5254
 SHA512:
-  metadata.gz: ff7cd428d4e85a6e52f84343932e42dbab7621cd6197d38a0166e90e3bbd791877a436122970d12d884158edccda287e5a34765f96688df1a644d3eb4164fd90
-  data.tar.gz: d538ed4a9b3f7b1a6d4b791c52c273a084f7ef697dcbd56d6b7905f8071fa3339a89cb53f99f08c86bc385d168efcd45c06f17b1e76f6d28927d73c836130179
+  metadata.gz: fa1a981b51c442d4e6a48dcd492ed6130edf2d69a10dac97a02d43ce5986751c37a5b116c0a64bc9697439650d7ec39b474daf4e11ea8fdd5ca78aa03bdacee1
+  data.tar.gz: a5eb5605c22a764824ead1cc5c591b7f039790778ec623d6901db4d0293aeb5cb2c8c8b045f712917be62c98a1377193e6594ddbba659880a395711996fa7195

data/lib/rbbt/matrix.rb

@@ -42,14 +42,16 @@ class Matrix
                    subsets = {}
                    case @labels
                    when Path
-                     labels = @labels.tsv
-                     factors = labels.fields
-                     labels.through do |sample,values|
-                       factors.zip(values).each do |factor,value|
-                         subsets[factor] ||= {}
-                         subsets[factor][value] ||= []
-                         subsets[factor][value] << sample
-                       end
+                     if @labels.exists?
+                      labels = @labels.tsv
+                      factors = labels.fields
+                      labels.through do |sample,values|
+                        factors.zip(values).each do |factor,value|
+                          subsets[factor] ||= {}
+                          subsets[factor][value] ||= []
+                          subsets[factor][value] << sample
+                        end
+                      end
                      end
 
                    when TSV
@@ -149,7 +151,7 @@ class Matrix
   end
 
   def tsv(to_gene=true, identifiers = nil)
-    if to_gene
+    if to_gene and TSV.parse_header(self.data_file).key_field != "Ensembl Gene ID"
       file =  self.to_gene(identifiers).data_file
       file.tsv :persist => true, :persist_dir => Matrix.matrix_dir.persist, :type => :double, :merge => true, :cast => nil
     else

metadata

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