Skip to content

Commit

Permalink
Preparing new BioC RELEASE_3_20
Browse files Browse the repository at this point in the history
This is a merge of branch 'master' into 'bioc_devel'
  • Loading branch information
c-mertes committed Apr 26, 2024
2 parents 88413c2 + dc99588 commit e8d8a62
Show file tree
Hide file tree
Showing 20 changed files with 818 additions and 91 deletions.
10 changes: 7 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: OUTRIDER
Title: OUTRIDER - OUTlier in RNA-Seq fInDER
Type: Package
Version: 1.21.1
Date: 2020-10-20
Version: 1.21.2
Date: 2024-04-24
URL: https://github.com/gagneurlab/OUTRIDER
BugReports: https://github.com/gagneurlab/OUTRIDER/issues
Authors@R: c(
Expand Down Expand Up @@ -42,6 +42,7 @@ Imports:
generics,
GenomicRanges,
ggplot2,
ggrepel,
grDevices,
heatmaply,
pheatmap,
Expand Down Expand Up @@ -70,7 +71,10 @@ Suggests:
RMariaDB,
AnnotationDbi,
beeswarm,
covr
covr,
GenomeInfoDb,
ggbio,
biovizBase
LinkingTo:
Rcpp,
RcppArmadillo
Expand Down
16 changes: 16 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export(plotExpectedVsObservedCounts)
export(plotExpressedGenes)
export(plotExpressionRank)
export(plotFPKM)
export(plotManhattan)
export(plotPowerAnalysis)
export(plotQQ)
export(plotSizeFactors)
Expand All @@ -53,6 +54,7 @@ exportMethods(plotAberrantPerSample)
exportMethods(plotCountCorHeatmap)
exportMethods(plotDispEsts)
exportMethods(plotEncDimSearch)
exportMethods(plotManhattan)
exportMethods(plotQQ)
exportMethods(plotVolcano)
exportMethods(results)
Expand All @@ -73,6 +75,7 @@ importFrom(BiocGenerics,plotDispEsts)
importFrom(BiocParallel,SerialParam)
importFrom(BiocParallel,bpisup)
importFrom(BiocParallel,bplapply)
importFrom(BiocParallel,bpmapply)
importFrom(BiocParallel,bpparam)
importFrom(BiocParallel,bpstart)
importFrom(BiocParallel,bpstop)
Expand All @@ -94,14 +97,22 @@ importFrom(DESeq2,show)
importFrom(DESeq2,sizeFactors)
importFrom(GenomicFeatures,exonsBy)
importFrom(GenomicRanges,GRanges)
importFrom(GenomicRanges,end)
importFrom(GenomicRanges,findOverlaps)
importFrom(GenomicRanges,reduce)
importFrom(GenomicRanges,start)
importFrom(GenomicRanges,width)
importFrom(IRanges,IRanges)
importFrom(PRROC,pr.curve)
importFrom(RColorBrewer,brewer.pal)
importFrom(S4Vectors,"metadata<-")
importFrom(S4Vectors,"values<-")
importFrom(S4Vectors,DataFrame)
importFrom(S4Vectors,endoapply)
importFrom(S4Vectors,metadata)
importFrom(S4Vectors,queryHits)
importFrom(S4Vectors,subjectHits)
importFrom(S4Vectors,values)
importFrom(SummarizedExperiment,"assay<-")
importFrom(SummarizedExperiment,"assays<-")
importFrom(SummarizedExperiment,"colData<-")
Expand All @@ -113,10 +124,13 @@ importFrom(SummarizedExperiment,assays)
importFrom(SummarizedExperiment,colData)
importFrom(SummarizedExperiment,mcols)
importFrom(SummarizedExperiment,rowData)
importFrom(SummarizedExperiment,rowRanges)
importFrom(generics,fit)
importFrom(ggplot2,aes)
importFrom(ggplot2,annotate)
importFrom(ggplot2,element_blank)
importFrom(ggplot2,facet_grid)
importFrom(ggplot2,facet_wrap)
importFrom(ggplot2,geom_abline)
importFrom(ggplot2,geom_bar)
importFrom(ggplot2,geom_histogram)
Expand All @@ -129,6 +143,7 @@ importFrom(ggplot2,geom_vline)
importFrom(ggplot2,ggplot)
importFrom(ggplot2,ggtitle)
importFrom(ggplot2,labs)
importFrom(ggplot2,quo_name)
importFrom(ggplot2,scale_color_brewer)
importFrom(ggplot2,scale_color_identity)
importFrom(ggplot2,scale_color_manual)
Expand All @@ -142,6 +157,7 @@ importFrom(ggplot2,theme_bw)
importFrom(ggplot2,xlab)
importFrom(ggplot2,ylab)
importFrom(ggplot2,ylim)
importFrom(ggrepel,geom_text_repel)
importFrom(grDevices,colorRampPalette)
importFrom(graphics,abline)
importFrom(graphics,axis)
Expand Down
6 changes: 6 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
CHANGES IN VERSION 1.20.1
-----------------------------
o Add Manhattenplot functionallity
o Bugfix in restricting for FDR correction and others (#54 and aa6e56a)
o Ensure correct injections of outliers (#37)

CHANGES IN VERSION 1.16.1
-----------------------------
o Add option to restrict FDR correction to sets of genes of interest
Expand Down
5 changes: 5 additions & 0 deletions R/AllGenerics.R
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ setGeneric("plotAberrantPerSample", function(object, ...)
setGeneric("plotCountCorHeatmap", function(object, ...)
standardGeneric("plotCountCorHeatmap"))

#' @rdname plotFunctions
#' @export
setGeneric("plotManhattan", function(object, ...)
standardGeneric("plotManhattan"))

#' @importFrom DESeq2 plotDispEsts
#' @noRd
#' @export
Expand Down
15 changes: 7 additions & 8 deletions R/ZscoreMatrix.R
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
#'
#' Z score computation
#'
#' Computes the z scores for every count in the matrix.
#' The z score is defined in the log2 space as follows:
#' \ifelse{html}{
#' \out{z<sub>ij</sub> = (l<sub>ij</sub> - mu<sub>j</sub><sup>l</sup>)/
#' sigma<sub>j</sub><sup>l</sup>}}{
#' \deqn{z_{ij} = \frac{l_{ij} - \mu_j^l}{\sigma_j^l}}},
#' where l is the log2 transformed normalized count and mu and sigma the
#' mean and standard deviation for gene j, respectively.
#' Computes the z scores for every count in the matrix.
#' The z score is defined in the log\eqn{_2}{[2]} space as follows:
#' \eqn{z_{ij} = \frac{l_{ij} - \mu_j^l}{
#' \sigma_j^l}}{z_ij = (l[ij] - mu[j]^l)/sigma[ij]}
#' where \code{l} is the log\eqn{_2}{[2]} transformed normalized count and
#' \eqn{\mu}{mu} and \eqn{\sigma}{sigma} the mean and standard deviation
#' for gene \code{j} and sample \code{i}, respectively.
#'
#' @param ods OutriderDataSet
#' @param ... Further arguments passed on to \code{ZscoreMatrix}.
Expand Down
2 changes: 2 additions & 0 deletions R/inputCheckerFunctions.R
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ checkCountRequirements <- function(ods, test=FALSE){
stop("There are genes without any read. Please filter first ",
"the data with: ods <- filterExpression(ods)")
}
# Filter out genes that have on average less than 1 count per 100 samples.
# Ony affects datasets with more than 100 samples.
filterGenes <- filterGenes | rowSums(counts(ods)) < ncol(ods)/100
if(any(filterGenes) & isFALSE(test)){
stop("The model requires for each gene at least 1 read ",
Expand Down
2 changes: 1 addition & 1 deletion R/method-evaluation.R
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ aberrant.OUTRIDER <- function(object, padjCutoff=0.05, zScoreCutoff=0,
#' @param by if the results should be summarized by 'sample',
#' 'gene' or not at all (default).
#' @param subsetName The name of a subset of genes of interest for which FDR
#' corected pvalues have been previously computed. Those FDR values
#' corected pvalues were previously computed. Those FDR values
#' on the subset will then be used to determine aberrant status.
#' Default is NULL (using transcriptome-wide FDR corrected pvalues).
#' @param ... Currently not in use.
Expand Down
Loading

0 comments on commit e8d8a62

Please sign in to comment.