rbbt-dm 1.1.13 → 1.1.14
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 +4 -4
- data/lib/rbbt/matrix.rb +3 -3
- data/lib/rbbt/matrix/differential.rb +4 -2
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c2b26e9957f7e161566093695ef9e6041be4e074
|
|
4
|
+
data.tar.gz: 16e52936efa8d8a8a80a998caf6d6f9b498600aa
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1ccf87c9524a4280fd691501ad6375d9375a2f0fb9e1ffa49221a3c891e1606670fa9f5d2a0e506144717e37bb1935febb505b858f330b1161df332ce2957b0c
|
|
7
|
+
data.tar.gz: 9ef1e9c5e5fb08e4cfdec45605d1ad6e1745b8ad4e0a9d685cbf78d2cb6c04895b54be1f4588f18b709d86b2a039176bc2a6de24a0fb1684656b19c7a2d9f350
|
data/lib/rbbt/matrix.rb
CHANGED
|
@@ -24,7 +24,7 @@ class Matrix
|
|
|
24
24
|
_header = nil
|
|
25
25
|
@organism ||= begin
|
|
26
26
|
_header ||= TSV.parse_header(@data_file)
|
|
27
|
-
_header.namespace || "Hsa"
|
|
27
|
+
_header.namespace || Organism.default_code("Hsa")
|
|
28
28
|
end
|
|
29
29
|
@identifiers = identifiers
|
|
30
30
|
end
|
|
@@ -110,7 +110,7 @@ class Matrix
|
|
|
110
110
|
contrast_samples = contrast.split(/[|,\n]/)
|
|
111
111
|
end
|
|
112
112
|
else
|
|
113
|
-
if subsets and
|
|
113
|
+
if subsets and main_factor
|
|
114
114
|
contrast_samples = subsets[main_factor].values.flatten.collect{|s| s.split ',' }.flatten.uniq - main_samples
|
|
115
115
|
else
|
|
116
116
|
contrast_samples = samples - main_samples
|
|
@@ -138,6 +138,6 @@ class Matrix
|
|
|
138
138
|
Misc.mean(v.compact)
|
|
139
139
|
end
|
|
140
140
|
end
|
|
141
|
-
Matrix.new file, labels, value_type,
|
|
141
|
+
Matrix.new file, labels, value_type, "Ensembl Gene ID", organism
|
|
142
142
|
end
|
|
143
143
|
end
|
|
@@ -9,7 +9,7 @@ class Matrix
|
|
|
9
9
|
end
|
|
10
10
|
|
|
11
11
|
name = data_file =~ /:>/ ? File.basename(data_file) : data_file
|
|
12
|
-
Persist.persist(name, :tsv, :persist => :update,
|
|
12
|
+
Persist.persist(name, :tsv, :persist => :update, :file => path,
|
|
13
13
|
:other => {:main => main_samples, :contrast => contrast_samples},
|
|
14
14
|
:prefix => "Diff", :dir => Matrix.matrix_dir.differential, :no_load => true) do |file|
|
|
15
15
|
|
|
@@ -30,7 +30,9 @@ data = rbbt.dm.matrix.differential(#{ R.ruby2R data_file },
|
|
|
30
30
|
log2=#{ R.ruby2R log2 },
|
|
31
31
|
outfile = #{R.ruby2R file},
|
|
32
32
|
key.field = #{R.ruby2R format},
|
|
33
|
-
two.channel = #{R.ruby2R two_channel}
|
|
33
|
+
two.channel = #{R.ruby2R two_channel},
|
|
34
|
+
namespace = #{R.ruby2R organism}
|
|
35
|
+
)
|
|
34
36
|
EOS
|
|
35
37
|
|
|
36
38
|
R.run(cmd, :monitor => true)
|
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.
|
|
4
|
+
version: 1.1.14
|
|
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-
|
|
11
|
+
date: 2015-09-18 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rbbt-util
|