Browse code

switch melt to reshape2

nsheff authored on 23/08/2017 01:26:00
Showing 3 changed files

... ...
@@ -31,12 +31,12 @@ importFrom(data.table,":=")
31 31
 importFrom(data.table,as.data.table)
32 32
 importFrom(data.table,data.table)
33 33
 importFrom(data.table,fread)
34
-importFrom(data.table,melt.data.table)
35 34
 importFrom(data.table,setDT)
36 35
 importFrom(data.table,setcolorder)
37 36
 importFrom(data.table,setkey)
38 37
 importFrom(data.table,setkeyv)
39 38
 importFrom(data.table,setnames)
39
+importFrom(reshape2,melt)
40 40
 importFrom(stats,fisher.test)
41 41
 importFrom(stats,setNames)
42 42
 importFrom(utils,write.table)
... ...
@@ -10,7 +10,8 @@
10 10
 #' @references \url{http://github.com/sheffien}
11 11
 #' @importFrom GenomicRanges GRanges GRangesList elementMetadata strand
12 12
 #' @import BiocGenerics S4Vectors IRanges
13
-#' @importFrom data.table ":=" setDT data.table setkey fread setnames as.data.table setcolorder melt.data.table setkeyv
13
+#' @importFrom reshape2 melt
14
+#' @importFrom data.table ":=" setDT data.table setkey fread setnames as.data.table setcolorder setkeyv
14 15
 #' @importFrom stats fisher.test setNames
15 16
 #' @importFrom utils write.table
16 17
 NULL
... ...
@@ -84,7 +84,6 @@ redefineUserSets=FALSE) {
84 84
 	# dbSets (rows) by userSets (columns), counting overlap.
85 85
 	olmat = do.call(cbind, geneSetDatabaseOverlap)
86 86
 
87
-
88 87
 	message("Calculating universe set overlaps...")
89 88
 	# Now for each test set, how many items *in the universe* does
90 89
 	# it overlap? This will go into the calculation for c
... ...
@@ -99,7 +98,7 @@ redefineUserSets=FALSE) {
99 98
 
100 99
 	# To build the fisher matrix, support is 'a'
101 100
 
102
-	scoreTable = data.table(data.table::melt.data.table(t(olmat), variable.factor=FALSE))
101
+	scoreTable = data.table(reshape2::melt(t(olmat), variable.factor=FALSE))
103 102
 
104 103
 	setnames(scoreTable, c("Var1", "Var2", "value"), c("userSet", "dbSet", "support"))
105 104