Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
eb37f59
Merge pull request #148 from BorchLab/master
ncborcherding May 9, 2025
6adcda5
Update functions for efficiency
ncborcherding May 9, 2025
7e93c95
Dodge violin plots
ncborcherding May 10, 2025
6fe76ec
Add filtering
ncborcherding May 10, 2025
95a306d
update unit tests for new functionality
ncborcherding May 10, 2025
421b9fb
Traditional enrichment plot
ncborcherding May 10, 2025
3655bac
update geyser enrichment annotation and testing
ncborcherding May 11, 2025
9b897dd
update scatterEnrichment
ncborcherding May 11, 2025
e9ede18
update heatmapEnrichment
ncborcherding May 11, 2025
a530d42
Update test-utils.R
ncborcherding May 11, 2025
15fee72
Update test-splitEnrichment.R
ncborcherding May 11, 2025
563a24c
Update DESCRIPTION
ncborcherding May 11, 2025
2569fbd
Delete global.R
ncborcherding May 11, 2025
05979ff
Update escape.gene.sets.R
ncborcherding May 11, 2025
4e06fa7
Delete helper-vdiffr.R
ncborcherding May 11, 2025
829a026
update scatter plotting
ncborcherding May 11, 2025
3c4b0d0
geyser pass check
ncborcherding May 11, 2025
665bcd0
update ridgeEnrichment
ncborcherding May 11, 2025
a43da4c
remove old testthat data
ncborcherding May 11, 2025
7e4455a
update heatmap
ncborcherding May 12, 2025
ade031b
update performNormalization
ncborcherding May 12, 2025
f86d519
update performPCA
ncborcherding May 12, 2025
fb93dfa
update pcaEnrichment
ncborcherding May 12, 2025
1872910
update runEscape
ncborcherding May 12, 2025
44139df
update densityEnrichment function
ncborcherding May 12, 2025
e29d50c
Update test-gseaEnrichment.R
ncborcherding May 12, 2025
b1b828f
update package documentation
ncborcherding May 12, 2025
576109c
Update escape.Rmd
ncborcherding May 12, 2025
167bfe1
Update performNormalization.R
ncborcherding May 12, 2025
f93a549
vignette now knits properly
ncborcherding May 12, 2025
94b5b06
Standardize function annotation
ncborcherding May 13, 2025
0bd02d7
update manual
ncborcherding May 13, 2025
d01234a
update argument usage in vignette
ncborcherding May 14, 2025
87ff1d8
Spelling and ASCII character removal
ncborcherding May 14, 2025
8105a2d
export gseaEnrichment
ncborcherding May 14, 2025
509a824
remove old snap shots
ncborcherding May 14, 2025
45499c5
MatrixGenerics update call
ncborcherding May 14, 2025
03f1f26
Update escape.gene.sets.R
ncborcherding May 14, 2025
8d87d37
supress persistant Seurat warnings
ncborcherding May 14, 2025
fd224a0
Collecting utils and deplaring globalvariables
ncborcherding May 14, 2025
fce176b
Working on declaring imports
ncborcherding May 14, 2025
fe7095a
Update splitEnrichment.R
ncborcherding May 14, 2025
c193993
Update runEscape.R
ncborcherding May 14, 2025
12d5f0c
leveling density and gsea enrichment
ncborcherding May 14, 2025
c21b079
Update WORDLIST
ncborcherding May 14, 2025
1d780a0
update importing of Seurat for testing
ncborcherding May 14, 2025
8f423a0
Update DESCRIPTION
ncborcherding May 14, 2025
bc74035
remove functions from gloabvariables
ncborcherding May 14, 2025
ca4ef7b
Create helper-seurat.R
ncborcherding May 14, 2025
11fffce
perserve sparse matrix for GSEA plot
ncborcherding May 14, 2025
e8a297a
Update testthat.R
ncborcherding May 14, 2025
4f2edd4
Working through unit test issues
ncborcherding May 14, 2025
f1b0417
fix splitEnrichment handling of > 2 groups
ncborcherding May 15, 2025
aa421e3
ridgeEnrichment gradient handling fix
ncborcherding May 15, 2025
3e9eed8
PCA returns similar list structures
ncborcherding May 15, 2025
1b0680a
Update test-utils.R
ncborcherding May 15, 2025
f1decbe
correct most of unit testint
ncborcherding May 15, 2025
d82fb87
working on conditional import
ncborcherding May 15, 2025
31ae8ce
remove import patchwork call
ncborcherding May 16, 2025
31debb3
conditional BPPARM usage
ncborcherding May 16, 2025
1ca1e30
Update imports
ncborcherding May 16, 2025
0e590e8
update import/suggests
ncborcherding May 16, 2025
14e38ec
perform normalization handling
ncborcherding May 16, 2025
6ae9cc4
suggestions from bioccheck
ncborcherding May 16, 2025
8220199
making fgseaEscape
ncborcherding May 19, 2025
039cbc5
Update fgseaEscape.R
ncborcherding May 19, 2025
c58465b
Update NEWS.md
ncborcherding May 19, 2025
eb586cf
Add enrichIt and plotting
ncborcherding May 19, 2025
b682a72
update vignette
ncborcherding May 19, 2025
2206a48
Update enrichItPlot.R
ncborcherding May 20, 2025
7223df9
Update escape.Rmd
ncborcherding May 20, 2025
0a7d126
enrichItPlot use tidy pronouns
ncborcherding May 20, 2025
06bd47f
enirchIt argument gene_col documentation
ncborcherding May 20, 2025
ea1ce47
Update DESCRIPTION
ncborcherding May 20, 2025
b4ec52a
clean up documentation and gitignore
ncborcherding May 20, 2025
dc5a088
Update .gitignore
ncborcherding May 20, 2025
eb6dce1
remove msigdbr call from vignette
ncborcherding May 20, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
.RHistory
escape.Rproj
.Rproj*
.RData
.RData
**/.tmp.driveupload
55 changes: 28 additions & 27 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: escape
Title: Easy single cell analysis platform for enrichment
Version: 2.3.1
Version: 2.5.0
Authors@R: c(
person(given = "Nick", family = "Borcherding", role = c("aut", "cre"), email = "ncborch@gmail.com"),
person(given = "Jared", family = "Andrews", role = c("aut"), email = "jared.andrews07@gmail.com"),
Expand All @@ -13,42 +13,43 @@ LazyData: false
RoxygenNote: 7.3.2
biocViews: Software, SingleCell, Classification, Annotation, GeneSetEnrichment, Sequencing, GeneSignaling, Pathways
Depends: R (>= 4.1)
Imports:
Imports:
ggdist,
ggplot2 (>= 3.5.0),
grDevices,
Matrix,
MatrixGenerics,
methods,
stats,
SummarizedExperiment,
utils
Suggests:
AUCell,
BiocParallel,
grDevices,
BiocStyle,
dplyr,
ggdist,
ggplot2,
ggpointdensity,
fgsea,
GSEABase,
GSVA,
SingleCellExperiment,
ggraph,
ggridges,
msigdb,
stats,
reshape2,
patchwork,
MatrixGenerics,
utils,
SummarizedExperiment,
UCell,
stringr,
methods,
SeuratObject,
Matrix
Suggests:
Seurat,
ggpointdensity,
GSVA,
hexbin,
scran,
igraph,
irlba,
knitr,
msigdb,
patchwork,
rmarkdown,
markdown,
BiocStyle,
RColorBrewer,
rlang,
scran,
SeuratObject,
Seurat,
SingleCellExperiment,
spelling,
stringr,
testthat (>= 3.0.0),
vdiffr
UCell
VignetteBuilder: knitr
Language: en-US
BugReports: https://github.com/BorchLab/escape/issues
64 changes: 13 additions & 51 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# Generated by roxygen2: do not edit by hand

export(densityEnrichment)
export(enrichIt)
export(enrichItPlot)
export(escape.matrix)
export(getGeneSets)
export(geyserEnrichment)
export(gseaEnrichment)
export(heatmapEnrichment)
export(pcaEnrichment)
export(performNormalization)
Expand All @@ -13,58 +16,17 @@ export(runEscape)
export(scatterEnrichment)
export(splitEnrichment)
import(ggplot2)
import(patchwork)
importFrom(AUCell,AUCell_buildRankings)
importFrom(AUCell,AUCell_calcAUC)
importFrom(BiocParallel,BatchtoolsParam)
importFrom(BiocParallel,MulticoreParam)
importFrom(BiocParallel,SerialParam)
importFrom(GSEABase,GeneSet)
importFrom(GSEABase,GeneSetCollection)
importFrom(GSEABase,geneIds)
importFrom(GSVA,gsva)
importFrom(GSVA,gsvaParam)
importFrom(GSVA,ssgseaParam)
importFrom(Matrix,colSums)
importFrom(Matrix,t)
importFrom(MatrixGenerics,rowMeans2)
importFrom(MatrixGenerics,rowSds)
importFrom(MatrixGenerics,rowSums2)
importFrom(SeuratObject,Assays)
importFrom(SeuratObject,CreateAssay5Object)
importFrom(SeuratObject,CreateAssayObject)
importFrom(SeuratObject,CreateDimReducObject)
importFrom(SeuratObject,Idents)
importFrom(SingleCellExperiment,"altExp<-")
importFrom(SingleCellExperiment,"reducedDim<-")
importFrom(SingleCellExperiment,altExp)
importFrom(SingleCellExperiment,altExps)
importFrom(SingleCellExperiment,colData)
importFrom(SingleCellExperiment,reducedDim)
importFrom(SummarizedExperiment,"assays<-")
importFrom(SummarizedExperiment,SummarizedExperiment)
importFrom(SummarizedExperiment,assay)
importFrom(SummarizedExperiment,assays)
importFrom(UCell,ScoreSignatures_UCell)
importFrom(dplyr,"%>%")
importFrom(dplyr,across)
importFrom(dplyr,group_by)
importFrom(dplyr,slice_max)
importFrom(dplyr,summarise)
importFrom(dplyr,summarise_at)
importFrom(SummarizedExperiment,colData)
importFrom(ggdist,stat_pointinterval)
importFrom(ggpointdensity,geom_pointdensity)
importFrom(ggridges,geom_density_ridges)
importFrom(ggridges,geom_density_ridges2)
importFrom(ggridges,geom_density_ridges_gradient)
importFrom(ggridges,position_points_jitter)
importFrom(grDevices,hcl.colors)
importFrom(methods,slot)
importFrom(msigdb,appendKEGG)
importFrom(msigdb,getMsigdb)
importFrom(reshape2,melt)
importFrom(grDevices,hcl.pals)
importFrom(stats,aggregate)
importFrom(stats,as.formula)
importFrom(stats,dist)
importFrom(stats,hclust)
importFrom(stats,prcomp)
importFrom(stringr,str_replace_all)
importFrom(stringr,str_sort)
importFrom(utils,getFromNamespace)
importFrom(stats,median)
importFrom(stats,na.omit)
importFrom(stats,p.adjust)
importFrom(stats,setNames)
importFrom(utils,head)
Loading