rbbt-util 5.26.9 → 5.26.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 969e0257ceac9c22472706d0f62eba65bc8abef86e01a6b5cc85a53cacdf251b
-  data.tar.gz: 26d131ed2ea4fd81edadf7792732af1245d2eb241e7172153d5c6e89a38ac495
+  metadata.gz: 7c1454994af12b81032c1a6df59d0eac32a575cef17cb5a55b3cb65a02e898a9
+  data.tar.gz: c4b6f2f9bdb2b80f5a90c6bb4dd9c41d6acba094fae748f97d01969f308db114
 SHA512:
-  metadata.gz: ea3c70cdd69bb47c95e712dc0bc7787a171ea4a127c3a3f28d2107d46b6bb98c45a6f16dbdf101b5eb220609e7837202a474fc9645cf802e5b0e62b0409aa422
-  data.tar.gz: dada2939694198ee4703296f63e805dbc4a587019bc3d737e74b8bc695542ef145064a20ec56b263eb85d99787f0bdd5e7cca45f67ff2d29c7cfa56e742e7d6f
+  metadata.gz: 38f212480a624cc5cf91eb542574a2268178462415f6e8b09f8ff58c3d75d0aa4f396ce0a2ebd189a6b4bf57207eb796b2331cb9475fcdf5e4a0b121f4547d9e
+  data.tar.gz: 42780a986412bfb387a8e8ecc359e2fb6df67767e4c44f9ff00781a4d58e23ca7433f4549c48cb78203729f0f0febb9df7c6f036beb10d8fdae0d85fda9cb3f4

data/lib/rbbt/association/item.rb

@@ -218,3 +218,9 @@ module AssociationItem
     end
   end
 end
+
+module TSV
+  def self.incidence(tsv)
+    AssociationItem.incidence Association.index(tsv, :persist => false).keys
+  end
+end

data/lib/rbbt/tsv/melt.rb

@@ -1,24 +1,32 @@
 module TSV
   def self.melt(tsv, key_field, header_field, fields, *info_fields, &block)
-    info_fields.unshift header_field
-    TSV.traverse tsv, :into => :dumper, :key_field => key_field, :fields => info_fields do |k,values|
-      res = fields.zip(values).collect do |field, value|
+    dumper = TSV::Dumper.new :key_field => "ID", :fields => [key_field] + info_fields, :type => :list
+    dumper.init
+    TSV.traverse tsv, :into => dumper, :fields => info_fields do |k,values|
+      values = [values] if tsv.type == :flat
+      values = Misc.zip_fields(values) if tsv.type == :double
+
+      res = []
+      values.each_with_index do |value,i|
         info_values = if block_given?
                         new = block.call value
                         next if new.nil?
                         new
                       else
-                        [value]
+                        value
                       end
-        info_values.unshift field
-        [field, info_values]
+        
+        info_values = [info_values] unless tsv.type == :double
+        id = [k, i] * ":"
+        res << [id, [k] + [info_values].flatten]
       end
       res.extend MultipleResult
       res
     end
   end
 
-  def melt(header_field, *info_fields, &block)
+  def melt(header_field = nil, *info_fields, &block)
+    info_fields = fields if info_fields.nil? || info_fields.empty?
     TSV.melt self, key_field, header_field, fields, *info_fields, &block
   end
 end

data/share/Rlib/util.R

@@ -182,7 +182,15 @@ rbbt.tsv.numeric <- function(filename, sep="\t", ...){
 }
 
 rbbt.tsv2matrix <- function(data){
-  new <- data.matrix(data);
+  d = data
+
+  d[d == TRUE] = 1
+  d[d == FALSE] = 0
+
+  d[d == 'true'] = 1
+  d[d == 'false'] = 0
+
+  new <- data.matrix(d);
   colnames(new) <- colnames(data);
   rownames(new) <- rownames(data);
   return(new);
@@ -521,11 +529,13 @@ rbbt.get.modes <- function(x,bw = NULL,spar = NULL) {
 rbbt.png_plot <- function(filename, p, width=500, height=500, ...){
     png(filename=filename, width=width, height=height, ...);
     eval(parse(text=p));
+    dev.off()
 }
 
 rbbt.tiff_plot <- function(filename, p, width=500, height=500, ...){
     tiff(filename=filename, width=width, height=height, ...);
     eval(parse(text=p));
+    dev.off()
 }
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.26.9
+  version: 5.26.10
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake