Skip to content

Commit 599bfab

Browse files
committed
ascend version 0.9.9
1 parent 73ba8c5 commit 599bfab

6 files changed

Lines changed: 16 additions & 10 deletions

File tree

DESCRIPTION

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,19 @@ Imports: utils,
2828
MASS,
2929
GenomeInfoDb,
3030
GenomeInfoDbData,
31-
BiocGenerics
32-
Suggests: umap,
31+
BiocGenerics,
32+
umap,
33+
Rtsne,
34+
irlba,
35+
fastcluster
36+
Suggests:
3337
scater,
3438
scran,
3539
Seurat,
3640
scone,
3741
devtools,
38-
Rtsne,
39-
irlba,
4042
knitr,
4143
locfit,
42-
fastcluster,
4344
rmarkdown,
4445
testthat,
4546
KernSmooth,

NAMESPACE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ importFrom(dplyr,intersect)
107107
importFrom(dplyr,left_join)
108108
importFrom(dplyr,semi_join)
109109
importFrom(dynamicTreeCut,cutreeDynamic)
110+
importFrom(fastcluster,hclust)
110111
importFrom(fields,interp.surface)
111112
importFrom(ggbeeswarm,geom_quasirandom)
112113
importFrom(ggplot2,aes)
@@ -133,6 +134,7 @@ importFrom(ggplot2,ylab)
133134
importFrom(graphics,legend)
134135
importFrom(graphics,smoothScatter)
135136
importFrom(gridExtra,grid.arrange)
137+
importFrom(irlba,prcomp_irlba)
136138
importFrom(methods,is)
137139
importFrom(reshape2,melt)
138140
importFrom(stats,as.dendrogram)
@@ -147,3 +149,4 @@ importFrom(stats,p.adjust)
147149
importFrom(stats,reorder)
148150
importFrom(stats,setNames)
149151
importFrom(tidyr,gather)
152+
importFrom(umap,umap)

R/ascend_clustering.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@ retrieveCluster <- function(x, hclust_obj = NULL, distance_matrix = NULL){
347347
#' @include ascend_objects.R
348348
#' @include ascend_dimreduction.R
349349
#' @importFrom stats dist setNames
350+
#' @importFrom fastcluster hclust
350351
#' @importFrom dynamicTreeCut cutreeDynamic
351352
#' @importFrom BiocParallel bplapply
352353
#' @export
@@ -383,7 +384,7 @@ setMethod("runCORE", signature("EMSet"), function(object,
383384
remove.outliers = FALSE
384385
}
385386

386-
if (!("PCA" %in% reducedDimNames(object))){
387+
if (!("PCA" %in% SingleCellExperiment::reducedDimNames(object))){
387388
stop("Please calculate PCA values using runPCA before using this function.")
388389
}
389390

R/ascend_dimreduction.R

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#' @param ... Additional arguments to pass to the UMAP function
1717
#' @return UMAP matrix stored in "UMAP" slot in reducedDims
1818
#'
19+
#' @importFrom umap umap
1920
#' @importFrom SummarizedExperiment assayNames
2021
#' @export
2122
setGeneric("runUMAP", def = function(object, ..., method, config){
@@ -164,6 +165,8 @@ calcVariance <- function(x, axis = c("row", "column")){
164165
#' @return An \linkS4class{EMSet} with a PCA-reduced matrix stored in the PCA
165166
#' slot.
166167
#' @include ascend_objects.R
168+
#'
169+
#' @importFrom irlba prcomp_irlba
167170
#' @importFrom SingleCellExperiment normcounts reducedDim
168171
#' @export
169172
setGeneric("runPCA", def = function(object, ..., ngenes, scaling) {

R/ascend_plots.R

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -738,8 +738,7 @@ plotMDS <- function(object, Dim1 = 1, Dim2 = 2, group = NULL, density = FALSE, P
738738
#' EMSet <- runUMAP(EMSet, method = "naive", config = umap.config)
739739
#'
740740
#' # Plot with t-SNE
741-
#' tsne_plot <- plotUMAP(EMSet, Dim1 = 1, Dim2 = 2, group = "cluster", density = FALSE)
742-
#'
741+
#' umap_plot <- plotUMAP(EMSet, Dim1 = 1, Dim2 = 2, group = "cluster", density = FALSE)
743742
#' }
744743
#' @importFrom ggplot2 ggplot aes geom_point labs ggtitle scale_alpha theme_bw
745744
#' @export

man/plotUMAP.Rd

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)