diff --git a/DESCRIPTION b/DESCRIPTION index 1ec029f..078daa6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -29,7 +29,7 @@ Roxygen: list(markdown = TRUE) RoxygenNote: 7.3.1 Imports: DelayedMatrixStats, - DelayedArray, + BiocGenerics, HDF5Array, S4Vectors, methods, @@ -57,7 +57,8 @@ Suggests: fgsea, escape, msigdb, - pheatmap + pheatmap, + DelayedArray VignetteBuilder: knitr Depends: GSEABase, diff --git a/NAMESPACE b/NAMESPACE index e9ea0a6..5b1ca8a 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -5,11 +5,11 @@ export(plotDensities) export(topGenes) import(dplyr) import(ggplot2) +importFrom(BiocGenerics,cbind) importFrom(BiocParallel,MulticoreParam) importFrom(BiocParallel,SerialParam) importFrom(BiocParallel,SnowParam) importFrom(BiocParallel,bplapply) -importFrom(DelayedArray,cbind) importFrom(DelayedMatrixStats,rowMeans2) importFrom(DelayedMatrixStats,rowSds) importFrom(DelayedMatrixStats,rowSums2) diff --git a/R/Cepo.R b/R/Cepo.R index cbd5f99..ca1d57e 100644 --- a/R/Cepo.R +++ b/R/Cepo.R @@ -36,7 +36,7 @@ #' @param ... Additional arguments passed to `BiocParallel::MulticoreParam` #' and `BiocParallel::SnowParam`. #' @importFrom DelayedMatrixStats rowSums2 rowMeans2 rowSds -#' @importFrom DelayedArray cbind +#' @importFrom BiocGenerics cbind #' @importFrom HDF5Array HDF5Array #' @importFrom BiocParallel SerialParam MulticoreParam SnowParam bplapply #' @importFrom stats pnorm pchisq @@ -299,7 +299,7 @@ oneCepo <- function(exprsMat, cellTypes, minCells = minCells, variability = vari 0)/sum(cellTypes == cts[i])) > exprsPct } names(meanPct.list) <- cts - keep <- rowSums_withnames(do.call(DelayedArray::cbind, meanPct.list)) > + keep <- rowSums_withnames(do.call(BiocGenerics::cbind, meanPct.list)) > 0 exprsMat <- exprsMat[keep, , drop = FALSE] } @@ -313,7 +313,7 @@ oneCepo <- function(exprsMat, cellTypes, minCells = minCells, variability = vari -idx, drop = FALSE])) + 1, base = 2)) > logfc } names(logfc.list) <- cts - keep <- rowSums_withnames(do.call(DelayedArray::cbind, logfc.list)) > + keep <- rowSums_withnames(do.call(BiocGenerics::cbind, logfc.list)) > 0 exprsMat <- exprsMat[keep, , drop = FALSE] } @@ -410,19 +410,19 @@ segIndex <- function(mat, stability, method, weight) { x1 <- rank(nz)/(length(nz) + 1) x2 <- 1 - rank(s)/(length(s) + 1) - # segIdx <- rowMeans_withnames(DelayedArray::cbind(x1, x2)) + # segIdx <- rowMeans_withnames(BiocGenerics::cbind(x1, x2)) if (method == "weightedMean") { - segIdx <- rowMeansWeighted_withnames(DelayedArray::cbind(x1, x2), + segIdx <- rowMeansWeighted_withnames(BiocGenerics::cbind(x1, x2), weight) } else if (method == "Stouffer") { - segIdx <- apply(-DelayedArray::cbind(x1, x2), 1, geneStats, method = "Stouffer") + segIdx <- apply(-BiocGenerics::cbind(x1, x2), 1, geneStats, method = "Stouffer") } else if (method == "OSP") { - segIdx <- apply(-DelayedArray::cbind(x1, x2), 1, geneStats, method = "OSP") + segIdx <- apply(-BiocGenerics::cbind(x1, x2), 1, geneStats, method = "OSP") } else if (method == "Fisher") { - segIdx <- apply(-DelayedArray::cbind(x1, x2), 1, geneStats, method = "Fisher") + segIdx <- apply(-BiocGenerics::cbind(x1, x2), 1, geneStats, method = "Fisher") } else if (method == "maxP") { - segIdx <- apply(-DelayedArray::cbind(x1, x2), 1, geneStats, method = "maxP") + segIdx <- apply(-BiocGenerics::cbind(x1, x2), 1, geneStats, method = "maxP") } return(segIdx)