Adapt result table format from long to wide for FDR subset results

R/AllGenerics.R

@@ -992,6 +992,8 @@ setMethod("results", "FraserDataSet", function(object,
                 aggregate=aggregate, collapse=collapse, geneColumn=geneColumn,
                 subsetName=NULL, additionalColumns=additionalColumns, 
                 BPPARAM=BPPARAM)
+        # to restore previous column order
+        prevColOrder <- colnames(as.data.table(res))
     }
 
     # add results for FDR_subsets if requested
@@ -1010,16 +1012,63 @@ setMethod("results", "FraserDataSet", function(object,
             res <- unlist(GRangesList(unlist(list(res, resls_subsets))))
         } else{
             res <- unlist(GRangesList(unlist(resls_subsets)))
+            # restore previous column order
+            prevColOrder <- colnames(as.data.table(resls_subsets[[1]]))
         }
+    }
+
+    # sort it if existing
+    if(length(res) > 0){
+
+        # dcast to have only one row per gene-sample combination
+        res <- as.data.table(res)
+        if(isTRUE(aggregate)){
+            dcastCols <- c("pValueGene", "padjustGene")
+        } else{
+            dcastCols <- "padjust"
+        }
+        res <- dcast(res, ... ~ FDR_set, value.var=dcastCols)
 
-        # sort it if existing
-        if(length(res) > 0){
-            res <- res[order(res$pValue)]
+        # rename column back to padjust for tw results after dcast
+        if(any(grepl("transcriptome-wide", colnames(res)))){
+            if(isTRUE(aggregate)){
+                setnames(res, "pValueGene_transcriptome-wide", "pValueGene")
+                setnames(res, "padjustGene_transcriptome-wide", "padjustGene")
+            } else{
+                setnames(res, "transcriptome-wide", "padjust")
+            }
+
+        } else{
+            res[, padjust := NA]
             if(isTRUE(aggregate)){
-                res <- res[!is.na(res$pValueGene)]
+                res[, pValueGene := NA]
+                res[, padjustGene := NA]
             }
         }
+
+        # restore previous column order
+        setcolorder(res, prevColOrder[prevColOrder != "FDR_set"])
+
+        # rename padjust columns for other gene sets to padjust_setname
+        for(setName in FDRsets){
+            setnames(res, setName, paste0("padjust_", setName), 
+                        skip_absent=TRUE)
+        }
+
+        # revert back to GRanges
+        res <- makeGRangesFromDataFrame(res, keep.extra.columns=TRUE)
+
+        # order rows based on transcriptome-wide FDR
+        res <- res[order(res$pValue)]
+        if(isTRUE(aggregate) & isTRUE(returnTranscriptomewideResults)){
+            res <- res[!is.na(res$pValueGene)]
+        }
+
+
+    } else{
+        res$FDR_set <- NULL
     }
+
     return(res)
 })
 

R/plotMethods.R

@@ -286,16 +286,13 @@
 #' 
 #' # other ways to call these plotting functions
 #' plotExpression(fds, idx=10, sampleID="sample1", type="jaccard")
-#' plotExpression(fds, result=res[FDR_set == "testSet",][1], 
-#'                  subsetName="testSet")
+#' plotExpression(fds, result=res[1], subsetName="testSet")
 #' plotQQ(fds, idx=10, sampleID="sample1", type="jaccard")
-#' plotQQ(fds, result=res[FDR_set == "testSet",][1], subsetName="testSet")
+#' plotQQ(fds, result=res[1], subsetName="testSet")
 #' plotExpectedVsObservedPsi(fds, idx=10, sampleID="sample1", type="jaccard")
-#' plotExpectedVsObservedPsi(fds, result=res[FDR_set == "testSet",][1], 
-#'                  subsetName="testSet")
+#' plotExpectedVsObservedPsi(fds, result=res[1], subsetName="testSet")
 #' plotSpliceMetricRank(fds, idx=10, sampleID="sample1", type="jaccard")
-#' plotSpliceMetricRank(fds, result=res[FDR_set == "testSet",][1], 
-#'                  subsetName="testSet")
+#' plotSpliceMetricRank(fds, result=res[1], subsetName="testSet")
 #' 
 #' # create manhattan plot of pvalues by genomic position
 #' if(require(ggbio)){
@@ -819,7 +816,7 @@ plotExpectedVsObservedPsi <- function(fds, type=fitMetrics(fds),
 
     if(is.null(colGroup)){
         g <- g + scale_colour_manual(
-            values=c("FALSE"="gray70", "TRUE"="firebrick"))
+            values=c("gray70", "firebrick"))
     }
 
     plotBasePlot(g, basePlot)

tests/testthat/test_plotSampleResults.R

@@ -35,6 +35,14 @@ test_that("Results function", {
     expect_equal(res_gene_signif[type == "psi3", .N], 2)
     expect_equal(res_gene_signif[type == "theta", .N], 3)
 
+    # results on subset of genes during FDR
+    geneList <- list('sample1'=c("TIMMDC1"), 'sample2'=c("MCOLN1"))
+    fds <- calculatePadjValues(fds, type="jaccard", 
+                     subsets=list("exampleSubset"=geneList))
+    expect_equal(length(results(fds, all=TRUE, psiType="jaccard")), 
+                prod(dim(fds)))
+    expect_error(results(fds, all=TRUE, psiType="psi5"))
+
 })
 
 test_that("Main plotting function", {