diff --git a/DESCRIPTION b/DESCRIPTION index 5e6f5b2..d3a890f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: Banksy Title: Spatial transcriptomic clustering -Version: 0.99.6 +Version: 0.99.7 Authors@R: c( person(given = "Vipul", family = "Singhal", @@ -19,7 +19,7 @@ Description: Banksy is an R package that incorporates spatial information to neighbor-augmented product space which can then be clustered, allowing for accurate and spatially-aware cell typing and tissue domain segmentation. Depends: - R (>= 4.3.0) + R (>= 4.4.0) Imports: aricode, data.table, @@ -41,7 +41,7 @@ License: file LICENSE Encoding: UTF-8 URL: https://github.com/prabhakarlab/Banksy BugReports: https://github.com/prabhakarlab/Banksy/issues -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.1 Suggests: knitr, rmarkdown, diff --git a/R/cluster.R b/R/cluster.R index 3f56c68..3ca7ec8 100644 --- a/R/cluster.R +++ b/R/cluster.R @@ -81,7 +81,7 @@ #' clusterBanksy <- function(se, - use_agf = TRUE, + use_agf = FALSE, lambda = 0.2, use_pcs = TRUE, npcs = 20L, diff --git a/R/computation.R b/R/computation.R index 59523a8..dd86df8 100644 --- a/R/computation.R +++ b/R/computation.R @@ -68,7 +68,7 @@ computeBanksy <- function(se, assay_name, coord_names = NULL, - compute_agf = TRUE, + compute_agf = FALSE, k_geom = 15, spatial_mode = c("kNN_median", "kNN_r", "kNN_rn", "kNN_rank", "kNN_unif", diff --git a/R/reduction.R b/R/reduction.R index bef4c48..47a18ff 100644 --- a/R/reduction.R +++ b/R/reduction.R @@ -41,7 +41,7 @@ #' spe <- runBanksyPCA(spe, M = 1, lambda = 0.2, npcs = 20) #' runBanksyPCA <- function(se, - use_agf = TRUE, + use_agf = FALSE, lambda = 0.2, npcs = 20L, assay_name = NULL, @@ -156,7 +156,7 @@ checkBanksyPCA <- function(params) { #' spe <- runBanksyUMAP(spe, M = 1, lambda = 0.2) #' runBanksyUMAP <- function(se, - use_agf = TRUE, + use_agf = FALSE, lambda = 0.2, use_pcs = TRUE, npcs = 20L, diff --git a/docs/404.html b/docs/404.html index 026c6f7..11a0cbc 100644 --- a/docs/404.html +++ b/docs/404.html @@ -32,7 +32,7 @@ Banksy - 0.99.5 + 0.99.7 diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index aa4cd6e..4c28df0 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -17,7 +17,7 @@ Banksy - 0.99.5 + 0.99.7 diff --git a/docs/articles/batch-correction.html b/docs/articles/batch-correction.html index bd626d2..60550a8 100644 --- a/docs/articles/batch-correction.html +++ b/docs/articles/batch-correction.html @@ -33,7 +33,7 @@ Banksy - 0.99.5 + 0.99.7 @@ -268,7 +268,7 @@

Run Harmony on BANKSY’s embeddingSession information

Vignette runtime:

-
#> Time difference of 2.47674 mins
+
#> Time difference of 2.191318 mins
 sessionInfo()
 #> R version 4.3.2 (2023-10-31)
@@ -293,118 +293,118 @@ 

Session information#> [1] ExperimentHub_2.10.0 AnnotationHub_3.10.0 #> [3] BiocFileCache_2.10.1 dbplyr_2.4.0 #> [5] spatialLIBD_1.14.1 ggspavis_1.8.0 -#> [7] cowplot_1.1.1 scater_1.30.0 -#> [9] ggplot2_3.4.4 harmony_0.1.1 -#> [11] Rcpp_1.0.11 data.table_1.14.8 -#> [13] scran_1.30.0 scuttle_1.12.0 -#> [15] Seurat_5.0.1 SeuratObject_5.0.0 -#> [17] sp_2.1-1 SpatialExperiment_1.12.0 +#> [7] cowplot_1.1.3 scater_1.30.1 +#> [9] ggplot2_3.4.4 harmony_1.2.0 +#> [11] Rcpp_1.0.12 data.table_1.15.0 +#> [13] scran_1.30.2 scuttle_1.12.0 +#> [15] Seurat_5.0.1 SeuratObject_5.0.1 +#> [17] sp_2.1-3 SpatialExperiment_1.12.0 #> [19] SingleCellExperiment_1.24.0 SummarizedExperiment_1.32.0 #> [21] Biobase_2.62.0 GenomicRanges_1.54.1 -#> [23] GenomeInfoDb_1.38.1 IRanges_2.36.0 -#> [25] S4Vectors_0.40.1 BiocGenerics_0.48.1 -#> [27] MatrixGenerics_1.14.0 matrixStats_1.1.0 -#> [29] Banksy_0.99.2 BiocStyle_2.30.0 +#> [23] GenomeInfoDb_1.38.6 IRanges_2.36.0 +#> [25] S4Vectors_0.40.2 BiocGenerics_0.48.1 +#> [27] MatrixGenerics_1.14.0 matrixStats_1.2.0 +#> [29] Banksy_0.99.7 BiocStyle_2.30.0 #> #> loaded via a namespace (and not attached): #> [1] fs_1.6.3 spatstat.sparse_3.0-3 #> [3] bitops_1.0-7 doParallel_1.0.17 #> [5] httr_1.4.7 RColorBrewer_1.1-3 #> [7] tools_4.3.2 sctransform_0.4.1 -#> [9] DT_0.30 utf8_1.2.4 +#> [9] DT_0.31 utf8_1.2.4 #> [11] R6_2.5.1 lazyeval_0.2.2 -#> [13] uwot_0.1.16 withr_2.5.2 +#> [13] uwot_0.1.16 withr_3.0.0 #> [15] gridExtra_2.3 progressr_0.14.0 -#> [17] cli_3.6.1 textshaping_0.3.7 -#> [19] spatstat.explore_3.2-5 fastDummies_1.7.3 -#> [21] labeling_0.4.3 sass_0.4.7 -#> [23] spatstat.data_3.0-3 ggridges_0.5.4 +#> [17] cli_3.6.2 textshaping_0.3.7 +#> [19] spatstat.explore_3.2-6 fastDummies_1.7.3 +#> [21] labeling_0.4.3 sass_0.4.8 +#> [23] spatstat.data_3.0-4 ggridges_0.5.6 #> [25] pbapply_1.7-2 pkgdown_2.0.7 #> [27] Rsamtools_2.18.0 systemfonts_1.0.5 -#> [29] dbscan_1.1-11 aricode_1.0.3 +#> [29] dbscan_1.1-12 aricode_1.0.3 #> [31] dichromat_2.0-0.1 sessioninfo_1.2.2 #> [33] parallelly_1.36.0 attempt_0.3.1 -#> [35] maps_3.4.1.1 limma_3.58.1 +#> [35] maps_3.4.2 limma_3.58.1 #> [37] pals_1.8 rstudioapi_0.15.0 -#> [39] RSQLite_2.3.3 BiocIO_1.12.0 +#> [39] RSQLite_2.3.5 BiocIO_1.12.0 #> [41] generics_0.1.3 ica_1.0-3 -#> [43] spatstat.random_3.2-1 dplyr_1.1.3 -#> [45] Matrix_1.6-1.1 ggbeeswarm_0.7.2 -#> [47] fansi_1.0.5 abind_1.4-5 -#> [49] lifecycle_1.0.4 yaml_2.3.7 -#> [51] edgeR_4.0.1 SparseArray_1.2.2 -#> [53] Rtsne_0.16 paletteer_1.5.0 +#> [43] spatstat.random_3.2-2 dplyr_1.1.4 +#> [45] Matrix_1.6-5 ggbeeswarm_0.7.2 +#> [47] fansi_1.0.6 abind_1.4-5 +#> [49] lifecycle_1.0.4 yaml_2.3.8 +#> [51] edgeR_4.0.15 SparseArray_1.2.4 +#> [53] Rtsne_0.17 paletteer_1.6.0 #> [55] grid_4.3.2 blob_1.2.4 -#> [57] promises_1.2.1 dqrng_0.3.1 +#> [57] promises_1.2.1 dqrng_0.3.2 #> [59] crayon_1.5.2 miniUI_0.1.1.1 #> [61] lattice_0.22-5 beachmat_2.18.0 #> [63] mapproj_1.2.11 KEGGREST_1.42.0 -#> [65] magick_2.8.1 pillar_1.9.0 -#> [67] knitr_1.45 metapod_1.10.0 -#> [69] rjson_0.2.21 future.apply_1.11.0 -#> [71] codetools_0.2-19 leiden_0.4.3 -#> [73] glue_1.6.2 vctrs_0.6.4 +#> [65] magick_2.8.2 pillar_1.9.0 +#> [67] knitr_1.45 metapod_1.10.1 +#> [69] rjson_0.2.21 future.apply_1.11.1 +#> [71] codetools_0.2-19 leiden_0.4.3.1 +#> [73] glue_1.7.0 vctrs_0.6.5 #> [75] png_0.1-8 spam_2.10-0 #> [77] gtable_0.3.4 rematch2_2.1.2 -#> [79] cachem_1.0.8 xfun_0.41 +#> [79] cachem_1.0.8 xfun_0.42 #> [81] S4Arrays_1.2.0 mime_0.12 -#> [83] ggside_0.2.2 survival_3.5-7 +#> [83] ggside_0.2.3 survival_3.5-7 #> [85] RcppHungarian_0.3 iterators_1.0.14 #> [87] fields_15.2 statmod_1.5.0 #> [89] bluster_1.12.0 interactiveDisplayBase_1.40.0 #> [91] ellipsis_0.3.2 fitdistrplus_1.1-11 -#> [93] ROCR_1.0-11 nlme_3.1-163 -#> [95] bit64_4.0.5 filelock_1.0.2 -#> [97] RcppAnnoy_0.0.21 rprojroot_2.0.3 -#> [99] bslib_0.5.1 irlba_2.3.5.1 -#> [101] vipor_0.4.5 KernSmooth_2.23-22 -#> [103] colorspace_2.1-0 DBI_1.1.3 -#> [105] tidyselect_1.2.0 curl_5.1.0 -#> [107] bit_4.0.5 compiler_4.3.2 -#> [109] BiocNeighbors_1.20.0 desc_1.4.2 -#> [111] DelayedArray_0.28.0 plotly_4.10.3 -#> [113] rtracklayer_1.62.0 bookdown_0.37 -#> [115] scales_1.2.1 lmtest_0.9-40 -#> [117] rappdirs_0.3.3 stringr_1.5.0 -#> [119] digest_0.6.33 goftest_1.2-3 -#> [121] spatstat.utils_3.0-4 rmarkdown_2.25 -#> [123] benchmarkmeData_1.0.4 XVector_0.42.0 +#> [93] ROCR_1.0-11 nlme_3.1-164 +#> [95] bit64_4.0.5 filelock_1.0.3 +#> [97] RcppAnnoy_0.0.22 bslib_0.6.1 +#> [99] irlba_2.3.5.1 vipor_0.4.7 +#> [101] KernSmooth_2.23-22 colorspace_2.1-0 +#> [103] DBI_1.2.1 tidyselect_1.2.0 +#> [105] curl_5.2.0 bit_4.0.5 +#> [107] compiler_4.3.2 BiocNeighbors_1.20.2 +#> [109] desc_1.4.3 DelayedArray_0.28.0 +#> [111] plotly_4.10.4 rtracklayer_1.62.0 +#> [113] bookdown_0.37 scales_1.3.0 +#> [115] lmtest_0.9-40 rappdirs_0.3.3 +#> [117] stringr_1.5.1 digest_0.6.34 +#> [119] goftest_1.2-3 spatstat.utils_3.0-4 +#> [121] rmarkdown_2.25 benchmarkmeData_1.0.4 +#> [123] RhpcBLASctl_0.23-42 XVector_0.42.0 #> [125] htmltools_0.5.7 pkgconfig_2.0.3 #> [127] sparseMatrixStats_1.14.0 highr_0.10 -#> [129] fastmap_1.1.1 rlang_1.1.2 -#> [131] htmlwidgets_1.6.2 shiny_1.7.5.1 +#> [129] fastmap_1.1.1 rlang_1.1.3 +#> [131] htmlwidgets_1.6.4 shiny_1.8.0 #> [133] DelayedMatrixStats_1.24.0 farver_2.1.1 #> [135] jquerylib_0.1.4 zoo_1.8-12 -#> [137] jsonlite_1.8.7 BiocParallel_1.36.0 -#> [139] mclust_6.0.0 config_0.3.2 -#> [141] BiocSingular_1.18.0 RCurl_1.98-1.13 +#> [137] jsonlite_1.8.8 BiocParallel_1.36.0 +#> [139] mclust_6.0.1 config_0.3.2 +#> [141] BiocSingular_1.18.0 RCurl_1.98-1.14 #> [143] magrittr_2.0.3 GenomeInfoDbData_1.2.11 -#> [145] dotCall64_1.1-0 patchwork_1.1.3 -#> [147] munsell_0.5.0 viridis_0.6.4 -#> [149] reticulate_1.34.0 leidenAlg_1.1.2 -#> [151] stringi_1.7.12 zlibbioc_1.48.0 -#> [153] MASS_7.3-60 plyr_1.8.9 -#> [155] parallel_4.3.2 listenv_0.9.0 -#> [157] ggrepel_0.9.4 deldir_1.0-9 -#> [159] Biostrings_2.70.1 sccore_1.0.4 +#> [145] dotCall64_1.1-1 patchwork_1.2.0 +#> [147] munsell_0.5.0 viridis_0.6.5 +#> [149] reticulate_1.35.0 leidenAlg_1.1.2 +#> [151] stringi_1.8.3 zlibbioc_1.48.0 +#> [153] MASS_7.3-60.0.1 plyr_1.8.9 +#> [155] parallel_4.3.2 listenv_0.9.1 +#> [157] ggrepel_0.9.5 deldir_2.0-2 +#> [159] Biostrings_2.70.2 sccore_1.0.4 #> [161] splines_4.3.2 tensor_1.5 -#> [163] locfit_1.5-9.8 igraph_1.5.1 -#> [165] spatstat.geom_3.2-7 RcppHNSW_0.5.0 +#> [163] locfit_1.5-9.8 igraph_2.0.1.1 +#> [165] spatstat.geom_3.2-8 RcppHNSW_0.6.0 #> [167] reshape2_1.4.4 ScaledMatrix_1.10.0 -#> [169] XML_3.99-0.15 BiocVersion_3.18.0 +#> [169] XML_3.99-0.16.1 BiocVersion_3.18.1 #> [171] evaluate_0.23 golem_0.4.1 #> [173] BiocManager_1.30.22 foreach_1.5.2 -#> [175] httpuv_1.6.12 RANN_2.6.1 -#> [177] tidyr_1.3.0 purrr_1.0.2 +#> [175] httpuv_1.6.14 RANN_2.6.1 +#> [177] tidyr_1.3.1 purrr_1.0.2 #> [179] polyclip_1.10-6 benchmarkme_1.0.8 -#> [181] future_1.33.0 scattermore_1.2 +#> [181] future_1.33.1 scattermore_1.2 #> [183] rsvd_1.0.5 xtable_1.8-4 #> [185] restfulr_0.0.15 RSpectra_0.16-1 -#> [187] later_1.3.1 viridisLite_0.4.2 -#> [189] ragg_1.2.6 tibble_3.2.1 -#> [191] GenomicAlignments_1.38.0 AnnotationDbi_1.64.1 +#> [187] later_1.3.2 viridisLite_0.4.2 +#> [189] ragg_1.2.7 tibble_3.2.1 +#> [191] GenomicAlignments_1.38.2 AnnotationDbi_1.64.1 #> [193] memoise_2.0.1 beeswarm_0.4.0 -#> [195] cluster_2.1.4 shinyWidgets_0.8.0 +#> [195] cluster_2.1.6 shinyWidgets_0.8.1 #> [197] globals_0.16.2

diff --git a/docs/articles/domain-segment.html b/docs/articles/domain-segment.html index 22bfa45..193de48 100644 --- a/docs/articles/domain-segment.html +++ b/docs/articles/domain-segment.html @@ -33,7 +33,7 @@ Banksy - 0.99.5 + 0.99.7 @@ -219,63 +219,62 @@

Session information#> [8] base #> #> other attached packages: -#> [1] cowplot_1.1.1 scater_1.30.0 +#> [1] cowplot_1.1.3 scater_1.30.1 #> [3] ggplot2_3.4.4 scuttle_1.12.0 #> [5] SpatialExperiment_1.12.0 SingleCellExperiment_1.24.0 #> [7] SummarizedExperiment_1.32.0 Biobase_2.62.0 -#> [9] GenomicRanges_1.54.1 GenomeInfoDb_1.38.1 -#> [11] IRanges_2.36.0 S4Vectors_0.40.1 +#> [9] GenomicRanges_1.54.1 GenomeInfoDb_1.38.6 +#> [11] IRanges_2.36.0 S4Vectors_0.40.2 #> [13] BiocGenerics_0.48.1 MatrixGenerics_1.14.0 -#> [15] matrixStats_1.1.0 data.table_1.14.8 -#> [17] Banksy_0.99.2 BiocStyle_2.30.0 +#> [15] matrixStats_1.2.0 data.table_1.15.0 +#> [17] Banksy_0.99.7 BiocStyle_2.30.0 #> #> loaded via a namespace (and not attached): #> [1] bitops_1.0-7 gridExtra_2.3 -#> [3] rlang_1.1.2 magrittr_2.0.3 +#> [3] rlang_1.1.3 magrittr_2.0.3 #> [5] compiler_4.3.2 sccore_1.0.4 #> [7] DelayedMatrixStats_1.24.0 systemfonts_1.0.5 -#> [9] vctrs_0.6.4 stringr_1.5.0 +#> [9] vctrs_0.6.5 stringr_1.5.1 #> [11] pkgconfig_2.0.3 crayon_1.5.2 -#> [13] fastmap_1.1.1 magick_2.8.1 +#> [13] fastmap_1.1.1 magick_2.8.2 #> [15] XVector_0.42.0 utf8_1.2.4 #> [17] rmarkdown_2.25 ggbeeswarm_0.7.2 -#> [19] ragg_1.2.6 purrr_1.0.2 -#> [21] xfun_0.41 zlibbioc_1.48.0 +#> [19] ragg_1.2.7 purrr_1.0.2 +#> [21] xfun_0.42 zlibbioc_1.48.0 #> [23] cachem_1.0.8 beachmat_2.18.0 -#> [25] jsonlite_1.8.7 DelayedArray_0.28.0 +#> [25] jsonlite_1.8.8 DelayedArray_0.28.0 #> [27] BiocParallel_1.36.0 irlba_2.3.5.1 #> [29] parallel_4.3.2 aricode_1.0.3 -#> [31] R6_2.5.1 bslib_0.5.1 -#> [33] stringi_1.7.12 leidenAlg_1.1.2 -#> [35] jquerylib_0.1.4 Rcpp_1.0.11 +#> [31] R6_2.5.1 bslib_0.6.1 +#> [33] stringi_1.8.3 leidenAlg_1.1.2 +#> [35] jquerylib_0.1.4 Rcpp_1.0.12 #> [37] bookdown_0.37 knitr_1.45 -#> [39] Matrix_1.6-1.1 igraph_1.5.1 -#> [41] tidyselect_1.2.0 viridis_0.6.4 +#> [39] Matrix_1.6-5 igraph_2.0.1.1 +#> [41] tidyselect_1.2.0 viridis_0.6.5 #> [43] rstudioapi_0.15.0 abind_1.4-5 -#> [45] yaml_2.3.7 codetools_0.2-19 +#> [45] yaml_2.3.8 codetools_0.2-19 #> [47] lattice_0.22-5 tibble_3.2.1 -#> [49] withr_2.5.2 evaluate_0.23 -#> [51] desc_1.4.2 mclust_6.0.0 +#> [49] withr_3.0.0 evaluate_0.23 +#> [51] desc_1.4.3 mclust_6.0.1 #> [53] pillar_1.9.0 BiocManager_1.30.22 -#> [55] generics_0.1.3 dbscan_1.1-11 -#> [57] rprojroot_2.0.3 RCurl_1.98-1.13 -#> [59] sparseMatrixStats_1.14.0 munsell_0.5.0 -#> [61] scales_1.2.1 glue_1.6.2 -#> [63] tools_4.3.2 BiocNeighbors_1.20.0 -#> [65] ScaledMatrix_1.10.0 fs_1.6.3 -#> [67] grid_4.3.2 colorspace_2.1-0 -#> [69] GenomeInfoDbData_1.2.11 RcppHungarian_0.3 -#> [71] beeswarm_0.4.0 BiocSingular_1.18.0 -#> [73] vipor_0.4.5 cli_3.6.1 -#> [75] rsvd_1.0.5 textshaping_0.3.7 -#> [77] fansi_1.0.5 viridisLite_0.4.2 -#> [79] S4Arrays_1.2.0 dplyr_1.1.3 -#> [81] uwot_0.1.16 gtable_0.3.4 -#> [83] sass_0.4.7 digest_0.6.33 -#> [85] ggrepel_0.9.4 SparseArray_1.2.2 -#> [87] rjson_0.2.21 memoise_2.0.1 -#> [89] htmltools_0.5.7 pkgdown_2.0.7 -#> [91] lifecycle_1.0.4 +#> [55] generics_0.1.3 dbscan_1.1-12 +#> [57] RCurl_1.98-1.14 sparseMatrixStats_1.14.0 +#> [59] munsell_0.5.0 scales_1.3.0 +#> [61] glue_1.7.0 tools_4.3.2 +#> [63] BiocNeighbors_1.20.2 ScaledMatrix_1.10.0 +#> [65] fs_1.6.3 grid_4.3.2 +#> [67] colorspace_2.1-0 GenomeInfoDbData_1.2.11 +#> [69] RcppHungarian_0.3 beeswarm_0.4.0 +#> [71] BiocSingular_1.18.0 vipor_0.4.7 +#> [73] cli_3.6.2 rsvd_1.0.5 +#> [75] textshaping_0.3.7 fansi_1.0.6 +#> [77] viridisLite_0.4.2 S4Arrays_1.2.0 +#> [79] dplyr_1.1.4 uwot_0.1.16 +#> [81] gtable_0.3.4 sass_0.4.8 +#> [83] digest_0.6.34 ggrepel_0.9.5 +#> [85] SparseArray_1.2.4 rjson_0.2.21 +#> [87] memoise_2.0.1 htmltools_0.5.7 +#> [89] pkgdown_2.0.7 lifecycle_1.0.4 diff --git a/docs/articles/figures/batch-correction-spatial-1.png b/docs/articles/figures/batch-correction-spatial-1.png index 0277546..205d399 100644 Binary files a/docs/articles/figures/batch-correction-spatial-1.png and b/docs/articles/figures/batch-correction-spatial-1.png differ diff --git a/docs/articles/figures/batch-correction-umap-1.png b/docs/articles/figures/batch-correction-umap-1.png index 9d9cc3a..527b301 100644 Binary files a/docs/articles/figures/batch-correction-umap-1.png and b/docs/articles/figures/batch-correction-umap-1.png differ diff --git a/docs/articles/index.html b/docs/articles/index.html index 14e0da0..fd19a43 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -17,7 +17,7 @@ Banksy - 0.99.5 + 0.99.7 diff --git a/docs/articles/multi-sample.html b/docs/articles/multi-sample.html index f658a91..c6dd3f1 100644 --- a/docs/articles/multi-sample.html +++ b/docs/articles/multi-sample.html @@ -33,7 +33,7 @@ Banksy - 0.99.5 + 0.99.7 @@ -337,7 +337,7 @@

Parsing BANKSY outputSession information

Vignette runtime:

-
#> Time difference of 2.466589 mins
+
#> Time difference of 2.836741 mins
 sessionInfo()
 #> R version 4.3.2 (2023-10-31)
@@ -362,115 +362,114 @@ 

Session information#> [1] ExperimentHub_2.10.0 AnnotationHub_3.10.0 #> [3] BiocFileCache_2.10.1 dbplyr_2.4.0 #> [5] spatialLIBD_1.14.1 ggspavis_1.8.0 -#> [7] cowplot_1.1.1 scater_1.30.0 +#> [7] cowplot_1.1.3 scater_1.30.1 #> [9] ggplot2_3.4.4 scuttle_1.12.0 -#> [11] Seurat_5.0.1 SeuratObject_5.0.0 -#> [13] sp_2.1-1 SpatialExperiment_1.12.0 +#> [11] Seurat_5.0.1 SeuratObject_5.0.1 +#> [13] sp_2.1-3 SpatialExperiment_1.12.0 #> [15] SingleCellExperiment_1.24.0 SummarizedExperiment_1.32.0 #> [17] Biobase_2.62.0 GenomicRanges_1.54.1 -#> [19] GenomeInfoDb_1.38.1 IRanges_2.36.0 -#> [21] S4Vectors_0.40.1 BiocGenerics_0.48.1 -#> [23] MatrixGenerics_1.14.0 matrixStats_1.1.0 -#> [25] Banksy_0.99.2 BiocStyle_2.30.0 +#> [19] GenomeInfoDb_1.38.6 IRanges_2.36.0 +#> [21] S4Vectors_0.40.2 BiocGenerics_0.48.1 +#> [23] MatrixGenerics_1.14.0 matrixStats_1.2.0 +#> [25] Banksy_0.99.7 BiocStyle_2.30.0 #> #> loaded via a namespace (and not attached): #> [1] fs_1.6.3 spatstat.sparse_3.0-3 #> [3] bitops_1.0-7 doParallel_1.0.17 #> [5] httr_1.4.7 RColorBrewer_1.1-3 #> [7] tools_4.3.2 sctransform_0.4.1 -#> [9] DT_0.30 utf8_1.2.4 +#> [9] DT_0.31 utf8_1.2.4 #> [11] R6_2.5.1 lazyeval_0.2.2 -#> [13] uwot_0.1.16 withr_2.5.2 +#> [13] uwot_0.1.16 withr_3.0.0 #> [15] gridExtra_2.3 progressr_0.14.0 -#> [17] cli_3.6.1 textshaping_0.3.7 -#> [19] spatstat.explore_3.2-5 fastDummies_1.7.3 -#> [21] labeling_0.4.3 sass_0.4.7 -#> [23] spatstat.data_3.0-3 ggridges_0.5.4 +#> [17] cli_3.6.2 textshaping_0.3.7 +#> [19] spatstat.explore_3.2-6 fastDummies_1.7.3 +#> [21] labeling_0.4.3 sass_0.4.8 +#> [23] spatstat.data_3.0-4 ggridges_0.5.6 #> [25] pbapply_1.7-2 pkgdown_2.0.7 #> [27] Rsamtools_2.18.0 systemfonts_1.0.5 -#> [29] dbscan_1.1-11 aricode_1.0.3 +#> [29] dbscan_1.1-12 aricode_1.0.3 #> [31] sessioninfo_1.2.2 parallelly_1.36.0 -#> [33] attempt_0.3.1 maps_3.4.1.1 +#> [33] attempt_0.3.1 maps_3.4.2 #> [35] limma_3.58.1 rstudioapi_0.15.0 -#> [37] RSQLite_2.3.3 BiocIO_1.12.0 +#> [37] RSQLite_2.3.5 BiocIO_1.12.0 #> [39] generics_0.1.3 ica_1.0-3 -#> [41] spatstat.random_3.2-1 dplyr_1.1.3 -#> [43] Matrix_1.6-1.1 ggbeeswarm_0.7.2 -#> [45] fansi_1.0.5 abind_1.4-5 -#> [47] lifecycle_1.0.4 edgeR_4.0.1 -#> [49] yaml_2.3.7 SparseArray_1.2.2 -#> [51] Rtsne_0.16 paletteer_1.5.0 +#> [41] spatstat.random_3.2-2 dplyr_1.1.4 +#> [43] Matrix_1.6-5 ggbeeswarm_0.7.2 +#> [45] fansi_1.0.6 abind_1.4-5 +#> [47] lifecycle_1.0.4 edgeR_4.0.15 +#> [49] yaml_2.3.8 SparseArray_1.2.4 +#> [51] Rtsne_0.17 paletteer_1.6.0 #> [53] grid_4.3.2 blob_1.2.4 #> [55] promises_1.2.1 crayon_1.5.2 #> [57] miniUI_0.1.1.1 lattice_0.22-5 #> [59] beachmat_2.18.0 KEGGREST_1.42.0 -#> [61] magick_2.8.1 pillar_1.9.0 +#> [61] magick_2.8.2 pillar_1.9.0 #> [63] knitr_1.45 rjson_0.2.21 -#> [65] future.apply_1.11.0 codetools_0.2-19 -#> [67] leiden_0.4.3 glue_1.6.2 -#> [69] data.table_1.14.8 vctrs_0.6.4 +#> [65] future.apply_1.11.1 codetools_0.2-19 +#> [67] leiden_0.4.3.1 glue_1.7.0 +#> [69] data.table_1.15.0 vctrs_0.6.5 #> [71] png_0.1-8 spam_2.10-0 #> [73] gtable_0.3.4 rematch2_2.1.2 -#> [75] cachem_1.0.8 xfun_0.41 +#> [75] cachem_1.0.8 xfun_0.42 #> [77] S4Arrays_1.2.0 mime_0.12 -#> [79] ggside_0.2.2 survival_3.5-7 +#> [79] ggside_0.2.3 survival_3.5-7 #> [81] RcppHungarian_0.3 iterators_1.0.14 #> [83] fields_15.2 statmod_1.5.0 #> [85] interactiveDisplayBase_1.40.0 ellipsis_0.3.2 #> [87] fitdistrplus_1.1-11 ROCR_1.0-11 -#> [89] nlme_3.1-163 bit64_4.0.5 -#> [91] filelock_1.0.2 RcppAnnoy_0.0.21 -#> [93] rprojroot_2.0.3 bslib_0.5.1 -#> [95] irlba_2.3.5.1 vipor_0.4.5 -#> [97] KernSmooth_2.23-22 colorspace_2.1-0 -#> [99] DBI_1.1.3 tidyselect_1.2.0 -#> [101] bit_4.0.5 compiler_4.3.2 -#> [103] curl_5.1.0 BiocNeighbors_1.20.0 -#> [105] desc_1.4.2 DelayedArray_0.28.0 -#> [107] plotly_4.10.3 rtracklayer_1.62.0 -#> [109] bookdown_0.37 scales_1.2.1 -#> [111] lmtest_0.9-40 rappdirs_0.3.3 -#> [113] stringr_1.5.0 digest_0.6.33 -#> [115] goftest_1.2-3 spatstat.utils_3.0-4 -#> [117] rmarkdown_2.25 benchmarkmeData_1.0.4 -#> [119] XVector_0.42.0 htmltools_0.5.7 -#> [121] pkgconfig_2.0.3 sparseMatrixStats_1.14.0 -#> [123] highr_0.10 fastmap_1.1.1 -#> [125] rlang_1.1.2 htmlwidgets_1.6.2 -#> [127] shiny_1.7.5.1 DelayedMatrixStats_1.24.0 -#> [129] farver_2.1.1 jquerylib_0.1.4 -#> [131] zoo_1.8-12 jsonlite_1.8.7 -#> [133] BiocParallel_1.36.0 mclust_6.0.0 -#> [135] config_0.3.2 BiocSingular_1.18.0 -#> [137] RCurl_1.98-1.13 magrittr_2.0.3 -#> [139] GenomeInfoDbData_1.2.11 dotCall64_1.1-0 -#> [141] patchwork_1.1.3 munsell_0.5.0 -#> [143] Rcpp_1.0.11 viridis_0.6.4 -#> [145] reticulate_1.34.0 leidenAlg_1.1.2 -#> [147] stringi_1.7.12 zlibbioc_1.48.0 -#> [149] MASS_7.3-60 plyr_1.8.9 -#> [151] parallel_4.3.2 listenv_0.9.0 -#> [153] ggrepel_0.9.4 deldir_1.0-9 -#> [155] Biostrings_2.70.1 sccore_1.0.4 -#> [157] splines_4.3.2 tensor_1.5 -#> [159] locfit_1.5-9.8 igraph_1.5.1 -#> [161] spatstat.geom_3.2-7 RcppHNSW_0.5.0 -#> [163] reshape2_1.4.4 ScaledMatrix_1.10.0 -#> [165] XML_3.99-0.15 BiocVersion_3.18.0 -#> [167] evaluate_0.23 golem_0.4.1 -#> [169] BiocManager_1.30.22 foreach_1.5.2 -#> [171] httpuv_1.6.12 RANN_2.6.1 -#> [173] tidyr_1.3.0 purrr_1.0.2 -#> [175] polyclip_1.10-6 benchmarkme_1.0.8 -#> [177] future_1.33.0 scattermore_1.2 -#> [179] rsvd_1.0.5 xtable_1.8-4 -#> [181] restfulr_0.0.15 RSpectra_0.16-1 -#> [183] later_1.3.1 viridisLite_0.4.2 -#> [185] ragg_1.2.6 tibble_3.2.1 -#> [187] GenomicAlignments_1.38.0 memoise_2.0.1 -#> [189] beeswarm_0.4.0 AnnotationDbi_1.64.1 -#> [191] cluster_2.1.4 shinyWidgets_0.8.0 -#> [193] globals_0.16.2

+#> [89] nlme_3.1-164 bit64_4.0.5 +#> [91] filelock_1.0.3 RcppAnnoy_0.0.22 +#> [93] bslib_0.6.1 irlba_2.3.5.1 +#> [95] vipor_0.4.7 KernSmooth_2.23-22 +#> [97] colorspace_2.1-0 DBI_1.2.1 +#> [99] tidyselect_1.2.0 bit_4.0.5 +#> [101] compiler_4.3.2 curl_5.2.0 +#> [103] BiocNeighbors_1.20.2 desc_1.4.3 +#> [105] DelayedArray_0.28.0 plotly_4.10.4 +#> [107] rtracklayer_1.62.0 bookdown_0.37 +#> [109] scales_1.3.0 lmtest_0.9-40 +#> [111] rappdirs_0.3.3 stringr_1.5.1 +#> [113] digest_0.6.34 goftest_1.2-3 +#> [115] spatstat.utils_3.0-4 rmarkdown_2.25 +#> [117] benchmarkmeData_1.0.4 XVector_0.42.0 +#> [119] htmltools_0.5.7 pkgconfig_2.0.3 +#> [121] sparseMatrixStats_1.14.0 highr_0.10 +#> [123] fastmap_1.1.1 rlang_1.1.3 +#> [125] htmlwidgets_1.6.4 shiny_1.8.0 +#> [127] DelayedMatrixStats_1.24.0 farver_2.1.1 +#> [129] jquerylib_0.1.4 zoo_1.8-12 +#> [131] jsonlite_1.8.8 BiocParallel_1.36.0 +#> [133] mclust_6.0.1 config_0.3.2 +#> [135] BiocSingular_1.18.0 RCurl_1.98-1.14 +#> [137] magrittr_2.0.3 GenomeInfoDbData_1.2.11 +#> [139] dotCall64_1.1-1 patchwork_1.2.0 +#> [141] munsell_0.5.0 Rcpp_1.0.12 +#> [143] viridis_0.6.5 reticulate_1.35.0 +#> [145] leidenAlg_1.1.2 stringi_1.8.3 +#> [147] zlibbioc_1.48.0 MASS_7.3-60.0.1 +#> [149] plyr_1.8.9 parallel_4.3.2 +#> [151] listenv_0.9.1 ggrepel_0.9.5 +#> [153] deldir_2.0-2 Biostrings_2.70.2 +#> [155] sccore_1.0.4 splines_4.3.2 +#> [157] tensor_1.5 locfit_1.5-9.8 +#> [159] igraph_2.0.1.1 spatstat.geom_3.2-8 +#> [161] RcppHNSW_0.6.0 reshape2_1.4.4 +#> [163] ScaledMatrix_1.10.0 XML_3.99-0.16.1 +#> [165] BiocVersion_3.18.1 evaluate_0.23 +#> [167] golem_0.4.1 BiocManager_1.30.22 +#> [169] foreach_1.5.2 httpuv_1.6.14 +#> [171] RANN_2.6.1 tidyr_1.3.1 +#> [173] purrr_1.0.2 polyclip_1.10-6 +#> [175] benchmarkme_1.0.8 future_1.33.1 +#> [177] scattermore_1.2 rsvd_1.0.5 +#> [179] xtable_1.8-4 restfulr_0.0.15 +#> [181] RSpectra_0.16-1 later_1.3.2 +#> [183] viridisLite_0.4.2 ragg_1.2.7 +#> [185] tibble_3.2.1 GenomicAlignments_1.38.2 +#> [187] memoise_2.0.1 beeswarm_0.4.0 +#> [189] AnnotationDbi_1.64.1 cluster_2.1.6 +#> [191] shinyWidgets_0.8.1 globals_0.16.2
diff --git a/docs/articles/parameter-selection.html b/docs/articles/parameter-selection.html index 10417b5..9185370 100644 --- a/docs/articles/parameter-selection.html +++ b/docs/articles/parameter-selection.html @@ -33,7 +33,7 @@ Banksy - 0.99.5 + 0.99.7 @@ -324,7 +324,7 @@

ParametersSession information

Vignette runtime:

-
#> Time difference of 44.3582 secs
+
#> Time difference of 47.01152 secs
 sessionInfo()
 #> R version 4.3.2 (2023-10-31)
@@ -346,65 +346,64 @@ 

Session information#> [8] base #> #> other attached packages: -#> [1] cowplot_1.1.1 scater_1.30.0 +#> [1] cowplot_1.1.3 scater_1.30.1 #> [3] ggplot2_3.4.4 scuttle_1.12.0 #> [5] SpatialExperiment_1.12.0 SingleCellExperiment_1.24.0 #> [7] SummarizedExperiment_1.32.0 Biobase_2.62.0 -#> [9] GenomicRanges_1.54.1 GenomeInfoDb_1.38.1 -#> [11] IRanges_2.36.0 S4Vectors_0.40.1 +#> [9] GenomicRanges_1.54.1 GenomeInfoDb_1.38.6 +#> [11] IRanges_2.36.0 S4Vectors_0.40.2 #> [13] BiocGenerics_0.48.1 MatrixGenerics_1.14.0 -#> [15] matrixStats_1.1.0 Banksy_0.99.2 +#> [15] matrixStats_1.2.0 Banksy_0.99.7 #> [17] BiocStyle_2.30.0 #> #> loaded via a namespace (and not attached): #> [1] bitops_1.0-7 gridExtra_2.3 -#> [3] rlang_1.1.2 magrittr_2.0.3 +#> [3] rlang_1.1.3 magrittr_2.0.3 #> [5] compiler_4.3.2 sccore_1.0.4 #> [7] DelayedMatrixStats_1.24.0 systemfonts_1.0.5 -#> [9] vctrs_0.6.4 stringr_1.5.0 +#> [9] vctrs_0.6.5 stringr_1.5.1 #> [11] pkgconfig_2.0.3 crayon_1.5.2 -#> [13] fastmap_1.1.1 magick_2.8.1 +#> [13] fastmap_1.1.1 magick_2.8.2 #> [15] XVector_0.42.0 labeling_0.4.3 #> [17] utf8_1.2.4 rmarkdown_2.25 -#> [19] ggbeeswarm_0.7.2 ragg_1.2.6 -#> [21] purrr_1.0.2 xfun_0.41 +#> [19] ggbeeswarm_0.7.2 ragg_1.2.7 +#> [21] purrr_1.0.2 xfun_0.42 #> [23] zlibbioc_1.48.0 cachem_1.0.8 -#> [25] beachmat_2.18.0 jsonlite_1.8.7 +#> [25] beachmat_2.18.0 jsonlite_1.8.8 #> [27] highr_0.10 DelayedArray_0.28.0 #> [29] BiocParallel_1.36.0 irlba_2.3.5.1 #> [31] parallel_4.3.2 aricode_1.0.3 -#> [33] R6_2.5.1 bslib_0.5.1 -#> [35] stringi_1.7.12 leidenAlg_1.1.2 -#> [37] jquerylib_0.1.4 Rcpp_1.0.11 +#> [33] R6_2.5.1 bslib_0.6.1 +#> [35] stringi_1.8.3 leidenAlg_1.1.2 +#> [37] jquerylib_0.1.4 Rcpp_1.0.12 #> [39] bookdown_0.37 knitr_1.45 -#> [41] Matrix_1.6-1.1 igraph_1.5.1 -#> [43] tidyselect_1.2.0 viridis_0.6.4 +#> [41] Matrix_1.6-5 igraph_2.0.1.1 +#> [43] tidyselect_1.2.0 viridis_0.6.5 #> [45] rstudioapi_0.15.0 abind_1.4-5 -#> [47] yaml_2.3.7 codetools_0.2-19 +#> [47] yaml_2.3.8 codetools_0.2-19 #> [49] lattice_0.22-5 tibble_3.2.1 -#> [51] withr_2.5.2 evaluate_0.23 -#> [53] desc_1.4.2 mclust_6.0.0 +#> [51] withr_3.0.0 evaluate_0.23 +#> [53] desc_1.4.3 mclust_6.0.1 #> [55] pillar_1.9.0 BiocManager_1.30.22 -#> [57] generics_0.1.3 dbscan_1.1-11 -#> [59] rprojroot_2.0.3 RCurl_1.98-1.13 -#> [61] sparseMatrixStats_1.14.0 munsell_0.5.0 -#> [63] scales_1.2.1 glue_1.6.2 -#> [65] tools_4.3.2 BiocNeighbors_1.20.0 -#> [67] data.table_1.14.8 ScaledMatrix_1.10.0 -#> [69] fs_1.6.3 grid_4.3.2 -#> [71] colorspace_2.1-0 GenomeInfoDbData_1.2.11 -#> [73] RcppHungarian_0.3 beeswarm_0.4.0 -#> [75] BiocSingular_1.18.0 vipor_0.4.5 -#> [77] cli_3.6.1 rsvd_1.0.5 -#> [79] textshaping_0.3.7 fansi_1.0.5 -#> [81] viridisLite_0.4.2 S4Arrays_1.2.0 -#> [83] dplyr_1.1.3 uwot_0.1.16 -#> [85] gtable_0.3.4 sass_0.4.7 -#> [87] digest_0.6.33 ggrepel_0.9.4 -#> [89] SparseArray_1.2.2 farver_2.1.1 -#> [91] rjson_0.2.21 memoise_2.0.1 -#> [93] htmltools_0.5.7 pkgdown_2.0.7 -#> [95] lifecycle_1.0.4

+#> [57] generics_0.1.3 dbscan_1.1-12 +#> [59] RCurl_1.98-1.14 sparseMatrixStats_1.14.0 +#> [61] munsell_0.5.0 scales_1.3.0 +#> [63] glue_1.7.0 tools_4.3.2 +#> [65] BiocNeighbors_1.20.2 data.table_1.15.0 +#> [67] ScaledMatrix_1.10.0 fs_1.6.3 +#> [69] grid_4.3.2 colorspace_2.1-0 +#> [71] GenomeInfoDbData_1.2.11 RcppHungarian_0.3 +#> [73] beeswarm_0.4.0 BiocSingular_1.18.0 +#> [75] vipor_0.4.7 cli_3.6.2 +#> [77] rsvd_1.0.5 textshaping_0.3.7 +#> [79] fansi_1.0.6 viridisLite_0.4.2 +#> [81] S4Arrays_1.2.0 dplyr_1.1.4 +#> [83] uwot_0.1.16 gtable_0.3.4 +#> [85] sass_0.4.8 digest_0.6.34 +#> [87] ggrepel_0.9.5 SparseArray_1.2.4 +#> [89] farver_2.1.1 rjson_0.2.21 +#> [91] memoise_2.0.1 htmltools_0.5.7 +#> [93] pkgdown_2.0.7 lifecycle_1.0.4
diff --git a/docs/authors.html b/docs/authors.html index 5d4253b..0b32597 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -17,7 +17,7 @@ Banksy - 0.99.5 + 0.99.7 diff --git a/docs/index.html b/docs/index.html index 6878a90..0da931c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -39,7 +39,7 @@ Banksy - 0.99.5 + 0.99.7 @@ -102,11 +102,13 @@

Overviewdistinguish subtly different cell-types stratified by microenvironment
  • identify spatial domains sharing the same microenvironment
  • -

    BANKSY is applicable to a wide array of spatial technologies (e.g. 10x Visium, Slide-seq, MERFISH, CosMX, CODEX) and scales well to large datasets. For more details, check out:

    +

    BANKSY is applicable to a wide array of spatial technologies (e.g. 10x Visium, Slide-seq, MERFISH, CosMX, CODEX) and scales well to large datasets. For more details, check out

    @@ -314,6 +316,7 @@

    Quick start

    Links

    diff --git a/docs/news/index.html b/docs/news/index.html index 4407790..6963f2f 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -17,7 +17,7 @@ Banksy - 0.99.5 + 0.99.7

    diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 1da4af6..c85ca54 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -6,7 +6,7 @@ articles: domain-segment: domain-segment.html multi-sample: multi-sample.html parameter-selection: parameter-selection.html -last_built: 2024-01-03T17:53Z +last_built: 2024-02-18T23:25Z urls: reference: https://prabhakarlab.github.io/Banksy/reference article: https://prabhakarlab.github.io/Banksy/articles diff --git a/docs/reference/Banksy-package.html b/docs/reference/Banksy-package.html index e0a745a..13687e6 100644 --- a/docs/reference/Banksy-package.html +++ b/docs/reference/Banksy-package.html @@ -17,7 +17,7 @@ Banksy - 0.99.5 + 0.99.7 diff --git a/docs/reference/clusterBanksy.html b/docs/reference/clusterBanksy.html index 3bc89ff..561b310 100644 --- a/docs/reference/clusterBanksy.html +++ b/docs/reference/clusterBanksy.html @@ -17,7 +17,7 @@ Banksy - 0.99.5 + 0.99.7 @@ -74,7 +74,7 @@

    Perform clustering in BANKSY's neighborhood-augmented feature space.

    clusterBanksy(
       se,
    -  use_agf = TRUE,
    +  use_agf = FALSE,
       lambda = 0.2,
       use_pcs = TRUE,
       npcs = 20L,
    diff --git a/docs/reference/clusterNames.html b/docs/reference/clusterNames.html
    index 639c1dd..f3c2af3 100644
    --- a/docs/reference/clusterNames.html
    +++ b/docs/reference/clusterNames.html
    @@ -17,7 +17,7 @@
           
           
             Banksy
    -        0.99.5
    +        0.99.7
           
         
    diff --git a/docs/reference/compareClusters.html b/docs/reference/compareClusters.html index 301700f..d5f5796 100644 --- a/docs/reference/compareClusters.html +++ b/docs/reference/compareClusters.html @@ -17,7 +17,7 @@ Banksy - 0.99.5 + 0.99.7
    diff --git a/docs/reference/computeBanksy.html b/docs/reference/computeBanksy.html index 504ca07..711084b 100644 --- a/docs/reference/computeBanksy.html +++ b/docs/reference/computeBanksy.html @@ -17,7 +17,7 @@ Banksy - 0.99.5 + 0.99.7 @@ -76,7 +76,7 @@

    Compute the component neighborhood matrices for the BANKSY matrix.

    se, assay_name, coord_names = NULL, - compute_agf = TRUE, + compute_agf = FALSE, k_geom = 15, spatial_mode = c("kNN_median", "kNN_r", "kNN_rn", "kNN_rank", "kNN_unif", "rNN_gauss"), n = 2, diff --git a/docs/reference/connectClusters.html b/docs/reference/connectClusters.html index dea42ad..175d3de 100644 --- a/docs/reference/connectClusters.html +++ b/docs/reference/connectClusters.html @@ -17,7 +17,7 @@ Banksy - 0.99.5 + 0.99.7 diff --git a/docs/reference/getBanksyMatrix.html b/docs/reference/getBanksyMatrix.html index 2681ec4..5518a1d 100644 --- a/docs/reference/getBanksyMatrix.html +++ b/docs/reference/getBanksyMatrix.html @@ -17,7 +17,7 @@ Banksy - 0.99.5 + 0.99.7 diff --git a/docs/reference/hippocampus.html b/docs/reference/hippocampus.html index cbf79f2..af7aced 100644 --- a/docs/reference/hippocampus.html +++ b/docs/reference/hippocampus.html @@ -21,7 +21,7 @@ Banksy - 0.99.5 + 0.99.7 diff --git a/docs/reference/index.html b/docs/reference/index.html index 64682e9..0070b27 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -17,7 +17,7 @@ Banksy - 0.99.5 + 0.99.7 diff --git a/docs/reference/rings.html b/docs/reference/rings.html index f6aa414..729cfaf 100644 --- a/docs/reference/rings.html +++ b/docs/reference/rings.html @@ -18,7 +18,7 @@ Banksy - 0.99.5 + 0.99.7 diff --git a/docs/reference/runBanksyPCA.html b/docs/reference/runBanksyPCA.html index fdf787b..7d76e02 100644 --- a/docs/reference/runBanksyPCA.html +++ b/docs/reference/runBanksyPCA.html @@ -17,7 +17,7 @@ Banksy - 0.99.5 + 0.99.7 @@ -74,7 +74,7 @@

    Run PCA on a BANKSY matrix.

    runBanksyPCA(
       se,
    -  use_agf = TRUE,
    +  use_agf = FALSE,
       lambda = 0.2,
       npcs = 20L,
       assay_name = NULL,
    diff --git a/docs/reference/runBanksyUMAP.html b/docs/reference/runBanksyUMAP.html
    index 6b3c246..10399d8 100644
    --- a/docs/reference/runBanksyUMAP.html
    +++ b/docs/reference/runBanksyUMAP.html
    @@ -17,7 +17,7 @@
           
           
             Banksy
    -        0.99.5
    +        0.99.7
           
         
    @@ -74,7 +74,7 @@

    Run UMAP on a BANKSY embedding.

    runBanksyUMAP(
       se,
    -  use_agf = TRUE,
    +  use_agf = FALSE,
       lambda = 0.2,
       use_pcs = TRUE,
       npcs = 20L,
    diff --git a/docs/reference/simulateDataset.html b/docs/reference/simulateDataset.html
    index c099320..48ce02c 100644
    --- a/docs/reference/simulateDataset.html
    +++ b/docs/reference/simulateDataset.html
    @@ -17,7 +17,7 @@
           
           
             Banksy
    -        0.99.5
    +        0.99.7
           
         
    diff --git a/docs/reference/smoothLabels.html b/docs/reference/smoothLabels.html index 26052dd..56c4b2e 100644 --- a/docs/reference/smoothLabels.html +++ b/docs/reference/smoothLabels.html @@ -17,7 +17,7 @@ Banksy - 0.99.5 + 0.99.7
    diff --git a/man/Banksy-package.Rd b/man/Banksy-package.Rd index a4db650..bd69ccb 100644 --- a/man/Banksy-package.Rd +++ b/man/Banksy-package.Rd @@ -3,7 +3,6 @@ \docType{package} \name{Banksy-package} \alias{Banksy-package} -\alias{_PACKAGE} \alias{Banksy} \title{The Banksy package} \description{ diff --git a/man/clusterBanksy.Rd b/man/clusterBanksy.Rd index 394e3c3..105d3a5 100644 --- a/man/clusterBanksy.Rd +++ b/man/clusterBanksy.Rd @@ -6,7 +6,7 @@ \usage{ clusterBanksy( se, - use_agf = TRUE, + use_agf = FALSE, lambda = 0.2, use_pcs = TRUE, npcs = 20L, diff --git a/man/computeBanksy.Rd b/man/computeBanksy.Rd index 64e5143..54501f0 100644 --- a/man/computeBanksy.Rd +++ b/man/computeBanksy.Rd @@ -8,7 +8,7 @@ computeBanksy( se, assay_name, coord_names = NULL, - compute_agf = TRUE, + compute_agf = FALSE, k_geom = 15, spatial_mode = c("kNN_median", "kNN_r", "kNN_rn", "kNN_rank", "kNN_unif", "rNN_gauss"), n = 2, diff --git a/man/runBanksyPCA.Rd b/man/runBanksyPCA.Rd index 1df384c..9c177a9 100644 --- a/man/runBanksyPCA.Rd +++ b/man/runBanksyPCA.Rd @@ -6,7 +6,7 @@ \usage{ runBanksyPCA( se, - use_agf = TRUE, + use_agf = FALSE, lambda = 0.2, npcs = 20L, assay_name = NULL, diff --git a/man/runBanksyUMAP.Rd b/man/runBanksyUMAP.Rd index ceedbfb..4bccd54 100644 --- a/man/runBanksyUMAP.Rd +++ b/man/runBanksyUMAP.Rd @@ -6,7 +6,7 @@ \usage{ runBanksyUMAP( se, - use_agf = TRUE, + use_agf = FALSE, lambda = 0.2, use_pcs = TRUE, npcs = 20L, diff --git a/tests/testthat/test-cluster.R b/tests/testthat/test-cluster.R index cd2aef0..de70ad1 100644 --- a/tests/testthat/test-cluster.R +++ b/tests/testthat/test-cluster.R @@ -4,8 +4,8 @@ library(SpatialExperiment) set.seed(1000) spe <- simulateDataset(rate = 2) -spe <- computeBanksy(spe, assay_name = "counts") -spe <- runBanksyPCA(spe, seed = 1000) +spe <- computeBanksy(spe, assay_name = "counts", compute_agf = TRUE) +spe <- runBanksyPCA(spe, use_agf = TRUE, seed = 1000) test_that("clusterBanksy with invalid algo", { expect_error(clusterBanksy(spe, algo = "?")) @@ -17,17 +17,17 @@ test_that("clusterBanksy with leiden specifies correct args", { }) test_that("clusterBanksy gives message when seeded", { - expect_message(clusterBanksy(spe, seed = 1000)) + expect_message(clusterBanksy(spe, use_agf = TRUE, seed = 1000)) }) test_that("clusterBanksy gives expected output", { - spe1 <- clusterBanksy(spe, use_pcs = TRUE, seed = 1000) + spe1 <- clusterBanksy(spe, use_agf = TRUE, use_pcs = TRUE, seed = 1000) expect_equal(length(clusterNames(spe1)), 1) - spe2 <- clusterBanksy(spe, use_pcs = FALSE, seed = 1000) + spe2 <- clusterBanksy(spe, use_agf = TRUE, use_pcs = FALSE, seed = 1000) expect_equal(length(clusterNames(spe2)), 1) }) -spe <- clusterBanksy(spe, resolution = 1, seed = 1000) +spe <- clusterBanksy(spe, use_agf = TRUE, resolution = 1, seed = 1000) test_that("connectClusters with invalid map_to", { expect_error(connectClusters(spe, map_to = "?")) diff --git a/tests/testthat/test-computation.R b/tests/testthat/test-computation.R index ca868ab..91440df 100644 --- a/tests/testthat/test-computation.R +++ b/tests/testthat/test-computation.R @@ -61,7 +61,8 @@ test_that("computeNeighbors with invalid spatial mode", { }) test_that("computeBanksy with spatial mode kNN_median", { - spe <- computeBanksy(spe, assay_name = "counts", spatial_mode = "kNN_median") + spe <- computeBanksy(spe, compute_agf = TRUE, + assay_name = "counts", spatial_mode = "kNN_median") expect_equal(dim(assay(spe, "H0")), dim(spe)) expect_equal(dim(assay(spe, "H1")), dim(spe)) @@ -70,7 +71,7 @@ test_that("computeBanksy with spatial mode kNN_median", { expect_equal(metadata(spe)$BANKSY_params$k_geom, c(15, 15)) expect_equal(metadata(spe)$BANKSY_params$spatial_mode, "kNN_median") - sce <- computeBanksy(sce, + sce <- computeBanksy(sce, compute_agf = TRUE, assay_name = "counts", spatial_mode = "kNN_median", coord_names = c("x", "y") ) @@ -79,7 +80,7 @@ test_that("computeBanksy with spatial mode kNN_median", { }) test_that("computeBanksy with subsampling", { - spe <- computeBanksy(spe, + spe <- computeBanksy(spe, compute_agf = TRUE, assay_name = "counts", spatial_mode = "kNN_median", k_geom = 30, sample_size = 15, sample_renorm = TRUE, seed = 1000 @@ -90,7 +91,7 @@ test_that("computeBanksy with subsampling", { test_that("computeBanksy with spatial mode kNN_median with XL k_geom", { expect_error( - computeBanksy(spe, + computeBanksy(spe, assay_name = "counts", spatial_mode = "kNN_median", k_geom = ncol(spe) + 1 ) @@ -98,7 +99,8 @@ test_that("computeBanksy with spatial mode kNN_median with XL k_geom", { }) test_that("computeBanksy with spatial_mode kNN_unif", { - spe <- computeBanksy(spe, assay_name = "counts", spatial_mode = "kNN_unif") + spe <- computeBanksy(spe, compute_agf = TRUE, + assay_name = "counts", spatial_mode = "kNN_unif") expect_equal(dim(assay(spe, "H0")), dim(spe)) expect_equal(dim(assay(spe, "H1")), dim(spe)) }) @@ -113,7 +115,8 @@ test_that("computeBanksy with spatial mode kNN_unif with XL k_geom", { }) test_that("computeBanksy with spatial_mode kNN_rn", { - spe <- computeBanksy(spe, assay_name = "counts", spatial_mode = "kNN_rn") + spe <- computeBanksy(spe, compute_agf = TRUE, + assay_name = "counts", spatial_mode = "kNN_rn") expect_equal(dim(assay(spe, "H0")), dim(spe)) expect_equal(dim(assay(spe, "H1")), dim(spe)) }) @@ -128,7 +131,8 @@ test_that("computeBanksy with spatial mode kNN_rn with XL k_geom", { }) test_that("computeBanksy with spatial_mode kNN_r", { - spe <- computeBanksy(spe, assay_name = "counts", spatial_mode = "kNN_r") + spe <- computeBanksy(spe, compute_agf = TRUE, + assay_name = "counts", spatial_mode = "kNN_r") expect_equal(dim(assay(spe, "H0")), dim(spe)) expect_equal(dim(assay(spe, "H1")), dim(spe)) }) @@ -143,7 +147,8 @@ test_that("computeBanksy with spatial mode kNN_r with XL k_geom", { }) test_that("computeBanksy with spatial_mode kNN_rank", { - spe <- computeBanksy(spe, assay_name = "counts", spatial_mode = "kNN_rank") + spe <- computeBanksy(spe, compute_agf = TRUE, + assay_name = "counts", spatial_mode = "kNN_rank") expect_equal(dim(assay(spe, "H0")), dim(spe)) expect_equal(dim(assay(spe, "H1")), dim(spe)) }) @@ -158,7 +163,8 @@ test_that("computeBanksy with spatial mode kNN_rank with XL k_geom", { }) test_that("computeBanksy with spatial_mode rNN_gauss", { - spe <- computeBanksy(spe, assay_name = "counts", spatial_mode = "rNN_gauss") + spe <- computeBanksy(spe, compute_agf = TRUE, + assay_name = "counts", spatial_mode = "rNN_gauss") expect_equal(dim(assay(spe, "H0")), dim(spe)) expect_equal(dim(assay(spe, "H1")), dim(spe)) }) @@ -179,7 +185,7 @@ test_that("getBanksyMatrix without computeBanksy", { }) test_that("getBanksyMatrix", { - spe <- computeBanksy(spe, assay_name = "counts") + spe <- computeBanksy(spe, compute_agf = TRUE, assay_name = "counts") dim_B0 <- c(nrow(spe) * 2, ncol(spe)) expect_equal(dim(getBanksyMatrix(spe, M = 0, lambda = 0.2)), dim_B0) @@ -207,7 +213,7 @@ test_that("getBanksyMatrix", { }) test_that("getBanksyMatrix multi-sample", { - spe <- computeBanksy(spe, "counts") + spe <- computeBanksy(spe, "counts", compute_agf = TRUE) expect_error(getBanksyMatrix( spe, diff --git a/tests/testthat/test-reduction.R b/tests/testthat/test-reduction.R index 60cdfca..b67ce1f 100644 --- a/tests/testthat/test-reduction.R +++ b/tests/testthat/test-reduction.R @@ -6,39 +6,40 @@ library(SpatialExperiment) data(rings) spe <- rings -spe <- computeBanksy(spe, assay_name = "counts") +spe <- computeBanksy(spe, assay_name = "counts", compute_agf = TRUE) test_that("runBanksyPCA gives message when seeded", { - expect_message(runBanksyPCA(spe, seed = 1000)) + expect_message(runBanksyPCA(spe, use_agf = TRUE, seed = 1000)) }) test_that("runBanksyPCA gives expected output", { - spe <- runBanksyPCA(spe) + spe <- runBanksyPCA(spe, use_agf = TRUE) expect_equal(dim(reducedDim(spe)), c(ncol(spe), 20)) expect_in("percentVar", names(attributes(reducedDim(spe)))) }) test_that("runBanksyUMAP without PCs computed", { - expect_error(runBanksyUMAP(spe, use_pcs = TRUE)) + expect_error(runBanksyUMAP(spe, use_agf = TRUE, use_pcs = TRUE)) }) test_that("runBanksyUMAP requesting too many PCs", { - spe <- runBanksyPCA(spe) - expect_error(runBanksyUMAP(spe, use_pcs = TRUE, npcs = 50)) + spe <- runBanksyPCA(spe, use_agf = TRUE) + expect_error(runBanksyUMAP(spe, use_agf = TRUE, use_pcs = TRUE, npcs = 50)) }) test_that("runBanksyUMAP gives expected output", { - spe <- runBanksyPCA(spe) - spe <- runBanksyUMAP(spe, use_pcs = TRUE) + spe <- runBanksyPCA(spe, use_agf = TRUE) + spe <- runBanksyUMAP(spe, use_agf = TRUE, use_pcs = TRUE) expect_equal(dim(reducedDim(spe, "UMAP_M1_lam0.2")), c(ncol(spe), 2)) - spe <- runBanksyUMAP(spe, use_pcs = FALSE) + spe <- runBanksyUMAP(spe, use_agf = TRUE, use_pcs = FALSE) expect_equal(dim(reducedDim(spe, "UMAP_M1_lam0.2")), c(ncol(spe), 2)) }) test_that("runBanksyUMAP gives message when seed", { - spe <- runBanksyPCA(spe) - expect_message(runBanksyUMAP(spe, use_pcs = TRUE, seed = 1000)) + spe <- runBanksyPCA(spe, use_agf = TRUE) + expect_message(runBanksyUMAP(spe, use_agf = TRUE, + use_pcs = TRUE, seed = 1000)) }) diff --git a/vignettes/figures/batch-correction-spatial-1.png b/vignettes/figures/batch-correction-spatial-1.png index 0277546..205d399 100644 Binary files a/vignettes/figures/batch-correction-spatial-1.png and b/vignettes/figures/batch-correction-spatial-1.png differ diff --git a/vignettes/figures/batch-correction-umap-1.png b/vignettes/figures/batch-correction-umap-1.png index 9d9cc3a..527b301 100644 Binary files a/vignettes/figures/batch-correction-umap-1.png and b/vignettes/figures/batch-correction-umap-1.png differ