rbbt-util 5.26.9 → 5.26.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 969e0257ceac9c22472706d0f62eba65bc8abef86e01a6b5cc85a53cacdf251b
4
- data.tar.gz: 26d131ed2ea4fd81edadf7792732af1245d2eb241e7172153d5c6e89a38ac495
3
+ metadata.gz: 7c1454994af12b81032c1a6df59d0eac32a575cef17cb5a55b3cb65a02e898a9
4
+ data.tar.gz: c4b6f2f9bdb2b80f5a90c6bb4dd9c41d6acba094fae748f97d01969f308db114
5
5
  SHA512:
6
- metadata.gz: ea3c70cdd69bb47c95e712dc0bc7787a171ea4a127c3a3f28d2107d46b6bb98c45a6f16dbdf101b5eb220609e7837202a474fc9645cf802e5b0e62b0409aa422
7
- data.tar.gz: dada2939694198ee4703296f63e805dbc4a587019bc3d737e74b8bc695542ef145064a20ec56b263eb85d99787f0bdd5e7cca45f67ff2d29c7cfa56e742e7d6f
6
+ metadata.gz: 38f212480a624cc5cf91eb542574a2268178462415f6e8b09f8ff58c3d75d0aa4f396ce0a2ebd189a6b4bf57207eb796b2331cb9475fcdf5e4a0b121f4547d9e
7
+ data.tar.gz: 42780a986412bfb387a8e8ecc359e2fb6df67767e4c44f9ff00781a4d58e23ca7433f4549c48cb78203729f0f0febb9df7c6f036beb10d8fdae0d85fda9cb3f4
@@ -218,3 +218,9 @@ module AssociationItem
218
218
  end
219
219
  end
220
220
  end
221
+
222
+ module TSV
223
+ def self.incidence(tsv)
224
+ AssociationItem.incidence Association.index(tsv, :persist => false).keys
225
+ end
226
+ end
data/lib/rbbt/tsv/melt.rb CHANGED
@@ -1,24 +1,32 @@
1
1
  module TSV
2
2
  def self.melt(tsv, key_field, header_field, fields, *info_fields, &block)
3
- info_fields.unshift header_field
4
- TSV.traverse tsv, :into => :dumper, :key_field => key_field, :fields => info_fields do |k,values|
5
- res = fields.zip(values).collect do |field, value|
3
+ dumper = TSV::Dumper.new :key_field => "ID", :fields => [key_field] + info_fields, :type => :list
4
+ dumper.init
5
+ TSV.traverse tsv, :into => dumper, :fields => info_fields do |k,values|
6
+ values = [values] if tsv.type == :flat
7
+ values = Misc.zip_fields(values) if tsv.type == :double
8
+
9
+ res = []
10
+ values.each_with_index do |value,i|
6
11
  info_values = if block_given?
7
12
  new = block.call value
8
13
  next if new.nil?
9
14
  new
10
15
  else
11
- [value]
16
+ value
12
17
  end
13
- info_values.unshift field
14
- [field, info_values]
18
+
19
+ info_values = [info_values] unless tsv.type == :double
20
+ id = [k, i] * ":"
21
+ res << [id, [k] + [info_values].flatten]
15
22
  end
16
23
  res.extend MultipleResult
17
24
  res
18
25
  end
19
26
  end
20
27
 
21
- def melt(header_field, *info_fields, &block)
28
+ def melt(header_field = nil, *info_fields, &block)
29
+ info_fields = fields if info_fields.nil? || info_fields.empty?
22
30
  TSV.melt self, key_field, header_field, fields, *info_fields, &block
23
31
  end
24
32
  end
data/share/Rlib/util.R CHANGED
@@ -182,7 +182,15 @@ rbbt.tsv.numeric <- function(filename, sep="\t", ...){
182
182
  }
183
183
 
184
184
  rbbt.tsv2matrix <- function(data){
185
- new <- data.matrix(data);
185
+ d = data
186
+
187
+ d[d == TRUE] = 1
188
+ d[d == FALSE] = 0
189
+
190
+ d[d == 'true'] = 1
191
+ d[d == 'false'] = 0
192
+
193
+ new <- data.matrix(d);
186
194
  colnames(new) <- colnames(data);
187
195
  rownames(new) <- rownames(data);
188
196
  return(new);
@@ -521,11 +529,13 @@ rbbt.get.modes <- function(x,bw = NULL,spar = NULL) {
521
529
  rbbt.png_plot <- function(filename, p, width=500, height=500, ...){
522
530
  png(filename=filename, width=width, height=height, ...);
523
531
  eval(parse(text=p));
532
+ dev.off()
524
533
  }
525
534
 
526
535
  rbbt.tiff_plot <- function(filename, p, width=500, height=500, ...){
527
536
  tiff(filename=filename, width=width, height=height, ...);
528
537
  eval(parse(text=p));
538
+ dev.off()
529
539
  }
530
540
 
531
541
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rbbt-util
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.26.9
4
+ version: 5.26.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-05-20 00:00:00.000000000 Z
11
+ date: 2019-05-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake