rbbt-dm 1.1.16 → 1.1.17

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
  SHA1:
3
- metadata.gz: 0ae479006dfc634dda28affa527fd67a90215c95
4
- data.tar.gz: d6b3e24779cf07cf276dc7273338e9bf04ed5f49
3
+ metadata.gz: 02a66fdb598d5f2ebbf7bdbb966e333828c25c74
4
+ data.tar.gz: a661e1801711f0de053b622449d0ac201cafef7e
5
5
  SHA512:
6
- metadata.gz: ecc5a24854bc69ccc075f652430f31db3e9e769b23ca87e2aa4c76441ccc5bedff2898e1575e28b83fb52f15f309e861cb528235c14f6e7b0b81c5d87c556f89
7
- data.tar.gz: 2ccfacc38784a9c4fe83e8e82ddebb7f17ab6ae9a93c703c51632e7fb6e0ca7e5443979bffeab0ded34f9298e0b553c8e78b362567e8d0cb89368e120f99d8e4
6
+ metadata.gz: 2dc3a421c78c79619ee01fdaadef01136da9bd6231fa8223be5184e6041e233ed2e8c7643000d055a8c79fe50c93d871fefabaaee625ac8e0bb46d57f2b20b23
7
+ data.tar.gz: d48a85fdbd66651cdead6cb3516c20b44f6a3190d95cfb98dad6d00434b114d96457bf7cee58b260fe5facb75ca979d5171569608108c255fdf1ea4dfe2d7a9a
@@ -18,12 +18,28 @@ class Matrix
18
18
 
19
19
  raise if file.nil?
20
20
 
21
- log2 = value_type.nil? or value_type == "count"
21
+ case value_type
22
+ when 'two_channel'
23
+ log2 = true
24
+ trend = false
25
+ two_channel = true
26
+ when nil, 'count', 'counts'
27
+ log2 = true
28
+ trend = false
29
+ two_channel = false
30
+ when 'fpkm'
31
+ log2 = true
32
+ trend = true
33
+ two_channel = false
34
+ else
22
35
  log2 = false
36
+ trend = true
23
37
  two_channel = false
24
- FileUtils.mkdir_p File.dirname(file) unless file.nil? or File.exists? File.dirname(file)
38
+ end
39
+
40
+ FileUtils.mkdir_p File.dirname(file) unless file.nil? or File.exists? File.dirname(file)
25
41
 
26
- cmd = <<-EOS
42
+ cmd = <<-EOS
27
43
 
28
44
  source('#{Rbbt.share.R["MA.R"].find}')
29
45
 
@@ -34,7 +50,8 @@ data = rbbt.dm.matrix.differential(#{ R.ruby2R data_file },
34
50
  outfile = #{R.ruby2R file},
35
51
  key.field = #{R.ruby2R format},
36
52
  two.channel = #{R.ruby2R two_channel},
37
- namespace = #{R.ruby2R organism}
53
+ namespace = #{R.ruby2R organism},
54
+ eBayes.trend = #{R.ruby2R trend}
38
55
  )
39
56
  EOS
40
57
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rbbt-dm
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.16
4
+ version: 1.1.17
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-10-26 00:00:00.000000000 Z
11
+ date: 2015-11-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rbbt-util