From e9f77cd9dbfc5d04c3d2375a112e970f72154f64 Mon Sep 17 00:00:00 2001 From: Stephanie Spielman Date: Fri, 8 Nov 2024 15:48:26 -0500 Subject: [PATCH 1/6] pass in data frame, not column, to calculate_stability. Scripts were also styled --- .../scripts/05_cluster_evaluation.R | 49 ++++++++++------- .../scripts/05_cluster_evaluation.R | 54 +++++++++++-------- 2 files changed, 60 insertions(+), 43 deletions(-) diff --git a/analyses/cell-type-ETP-ALL-03/scripts/05_cluster_evaluation.R b/analyses/cell-type-ETP-ALL-03/scripts/05_cluster_evaluation.R index 856a8f1e5..74bbec7cd 100644 --- a/analyses/cell-type-ETP-ALL-03/scripts/05_cluster_evaluation.R +++ b/analyses/cell-type-ETP-ALL-03/scripts/05_cluster_evaluation.R @@ -1,42 +1,51 @@ #!/usr/bin/env Rscript -## Calculates silhouette score and purity for each cluster and evaluates their stability, +## Calculates silhouette score and purity for each cluster and evaluates their stability, ## using the functions available in evaluate-cluster.R (on OpenscPCA portal) library(Seurat) library(dplyr) -run_eval <- function(ind.lib){ - seu <- readRDS(file.path(out_loc,"results/rds",paste0(ind.lib,".rds"))) - clusID.df <- data.frame(FetchData(seu, vars = "leiden_clusters"))|> tibble::rownames_to_column(var = "cell_id") +run_eval <- function(ind.lib) { + seu <- readRDS(file.path(out_loc, "results/rds", paste0(ind.lib, ".rds"))) + clusID.df <- data.frame(FetchData(seu, vars = "leiden_clusters")) |> tibble::rownames_to_column(var = "cell_id") colnames(clusID.df)[2] <- "cluster" cluster_df1 <- rOpenScPCA::calculate_silhouette(x = seu, cluster_df = clusID.df, pc_name = "Xpca_") cluster_df2 <- rOpenScPCA::calculate_purity(x = seu, cluster_df = clusID.df, pc_name = "Xpca_") - final_df <- merge(cluster_df1, cluster_df2, by = c("cell_id","cluster")) - perClus_df <- final_df %>% group_by(cluster) %>% + final_df <- merge(cluster_df1, cluster_df2, by = c("cell_id", "cluster")) + perClus_df <- final_df %>% + group_by(cluster) %>% summarise(avgSil = mean(silhouette_width), avgPur = mean(purity)) %>% data.frame() - stability_df <- rOpenScPCA::calculate_stability(x = seu, clusters = clusID.df$cluster, - pc_name = "Xpca_",algorithm = "leiden", - resolution = 1.0, objective_function = "modularity", - seed = 10) - write.table(final_df, sep = "\t", row.names = F, quote = F, - file = file.path(out_loc,"results/evalClus/",paste0(ind.lib,"_sil-purity_perCell.txt"))) - write.table(stability_df, sep = "\t", row.names = F, quote = F, - file = file.path(out_loc,"results/evalClus/",paste0(ind.lib,"_stability.txt"))) - write.table(perClus_df, sep = "\t", row.names = F, quote = F, - file = file.path(out_loc,"results/evalClus/",paste0(ind.lib,"_avgSil-purity_perClus.txt"))) + stability_df <- rOpenScPCA::calculate_stability( + x = seu, clusters = clusID.df, + pc_name = "Xpca_", algorithm = "leiden", + resolution = 1.0, objective_function = "modularity", + seed = 10 + ) + write.table(final_df, + sep = "\t", row.names = F, quote = F, + file = file.path(out_loc, "results/evalClus/", paste0(ind.lib, "_sil-purity_perCell.txt")) + ) + write.table(stability_df, + sep = "\t", row.names = F, quote = F, + file = file.path(out_loc, "results/evalClus/", paste0(ind.lib, "_stability.txt")) + ) + write.table(perClus_df, + sep = "\t", row.names = F, quote = F, + file = file.path(out_loc, "results/evalClus/", paste0(ind.lib, "_avgSil-purity_perClus.txt")) + ) } -project_root <- rprojroot::find_root(rprojroot::is_git_root) +project_root <- rprojroot::find_root(rprojroot::is_git_root) projectID <- "SCPCP000003" out_loc <- file.path(project_root, "analyses/cell-type-ETP-ALL-03") -data_loc <- file.path(project_root, "data/current",projectID) +data_loc <- file.path(project_root, "data/current", projectID) dir.create(file.path(out_loc, "results/evalClus"), showWarnings = FALSE) -metadata <- read.table(file.path(data_loc,"single_cell_metadata.tsv"), sep = "\t", header = T) +metadata <- read.table(file.path(data_loc, "single_cell_metadata.tsv"), sep = "\t", header = T) metadata <- metadata[which(metadata$scpca_project_id == projectID & - metadata$diagnosis == "Early T-cell precursor T-cell acute lymphoblastic leukemia"), ] + metadata$diagnosis == "Early T-cell precursor T-cell acute lymphoblastic leukemia"), ] libraryID <- metadata$scpca_library_id purrr::walk(libraryID, run_eval) diff --git a/analyses/cell-type-nonETP-ALL-03/scripts/05_cluster_evaluation.R b/analyses/cell-type-nonETP-ALL-03/scripts/05_cluster_evaluation.R index 11c31a42b..1995ce421 100644 --- a/analyses/cell-type-nonETP-ALL-03/scripts/05_cluster_evaluation.R +++ b/analyses/cell-type-nonETP-ALL-03/scripts/05_cluster_evaluation.R @@ -1,47 +1,55 @@ #!/usr/bin/env Rscript -## Calculates silhouette score and purity for each cluster and evalutes their stability, +## Calculates silhouette score and purity for each cluster and evalutes their stability, ## using the functions available in evaluate-cluster.R (on OpenscPCA portal) ## But this script is calling evaluate-cluster.R in the same directory (not sure how to call from OpenscPCA portal) library(Seurat) library(dplyr) -run_eval <- function(ind.lib){ - seu <- readRDS(file.path(out_loc,"results/rds",paste0(ind.lib,".rds"))) - clusID.df <- data.frame(FetchData(seu, vars = "leiden_clusters"))|> tibble::rownames_to_column(var = "cell_id") +run_eval <- function(ind.lib) { + seu <- readRDS(file.path(out_loc, "results/rds", paste0(ind.lib, ".rds"))) + clusID.df <- data.frame(FetchData(seu, vars = "leiden_clusters")) |> tibble::rownames_to_column(var = "cell_id") colnames(clusID.df)[2] <- "cluster" cluster_df1 <- rOpenScPCA::calculate_silhouette(x = seu, cluster_df = clusID.df, pc_name = "Xpca_") cluster_df2 <- rOpenScPCA::calculate_purity(x = seu, cluster_df = clusID.df, pc_name = "Xpca_") - final_df <- merge(cluster_df1, cluster_df2, by = c("cell_id","cluster")) - perClus_df <- final_df %>% group_by(cluster) %>% + final_df <- merge(cluster_df1, cluster_df2, by = c("cell_id", "cluster")) + perClus_df <- final_df %>% + group_by(cluster) %>% summarise(avgSil = mean(silhouette_width), avgPur = mean(purity)) %>% data.frame() - stability_df <- rOpenScPCA::calculate_stability(x = seu, clusters = clusID.df$cluster, - pc_name = "Xpca_",algorithm = "leiden", - resolution = 1.0, objective_function = "modularity", - seed = 10) - write.table(final_df, sep = "\t", row.names = F, quote = F, - file = file.path(out_loc,"results/evalClus/",paste0(ind.lib,"_sil-purity_perCell.txt"))) - write.table(stability_df, sep = "\t", row.names = F, quote = F, - file = file.path(out_loc,"results/evalClus/",paste0(ind.lib,"_stability.txt"))) - write.table(perClus_df, sep = "\t", row.names = F, quote = F, - file = file.path(out_loc,"results/evalClus/",paste0(ind.lib,"_avgSil-purity_perClus.txt"))) + stability_df <- rOpenScPCA::calculate_stability( + x = seu, clusters = clusID.df, + pc_name = "Xpca_", algorithm = "leiden", + resolution = 1.0, objective_function = "modularity", + seed = 10 + ) + write.table(final_df, + sep = "\t", row.names = F, quote = F, + file = file.path(out_loc, "results/evalClus/", paste0(ind.lib, "_sil-purity_perCell.txt")) + ) + write.table(stability_df, + sep = "\t", row.names = F, quote = F, + file = file.path(out_loc, "results/evalClus/", paste0(ind.lib, "_stability.txt")) + ) + write.table(perClus_df, + sep = "\t", row.names = F, quote = F, + file = file.path(out_loc, "results/evalClus/", paste0(ind.lib, "_avgSil-purity_perClus.txt")) + ) } -project_root <- rprojroot::find_root(rprojroot::is_git_root) +project_root <- rprojroot::find_root(rprojroot::is_git_root) projectID <- "SCPCP000003" out_loc <- file.path(project_root, "analyses/cell-type-nonETP-ALL-03") -data_loc <- file.path(project_root, "data/current",projectID) +data_loc <- file.path(project_root, "data/current", projectID) dir.create(file.path(out_loc, "results/evalClus"), showWarnings = FALSE) -#loading functions for evaluating clusters -#source(file.path(out_loc,"scripts/evaluate-clusters.R")) +# loading functions for evaluating clusters +# source(file.path(out_loc,"scripts/evaluate-clusters.R")) -metadata <- read.table(file.path(data_loc,"single_cell_metadata.tsv"), sep = "\t", header = T) +metadata <- read.table(file.path(data_loc, "single_cell_metadata.tsv"), sep = "\t", header = T) metadata <- metadata[which(metadata$scpca_project_id == projectID & - metadata$diagnosis == "Non-early T-cell precursor T-cell acute lymphoblastic leukemia"), ] + metadata$diagnosis == "Non-early T-cell precursor T-cell acute lymphoblastic leukemia"), ] libraryID <- metadata$scpca_library_id purrr::walk(libraryID, run_eval) - From f509f33c94ee3e99ff82ee6b4f2779415befc5ea Mon Sep 17 00:00:00 2001 From: Stephanie Spielman Date: Fri, 8 Nov 2024 16:10:50 -0500 Subject: [PATCH 2/6] force new CI run From 2dd6dad7a58ad675765de71c9ab642814af98929 Mon Sep 17 00:00:00 2001 From: Stephanie Spielman Date: Mon, 11 Nov 2024 10:19:16 -0500 Subject: [PATCH 3/6] force new CI run, hopefully no more cache From 627af569c8b47a7ff9fed729598353ac79c3f77a Mon Sep 17 00:00:00 2001 From: Stephanie Spielman Date: Mon, 11 Nov 2024 11:30:24 -0500 Subject: [PATCH 4/6] renv.lock files need new hash --- analyses/cell-type-ETP-ALL-03/renv.lock | 351 ++++++++++++++++++++- analyses/cell-type-nonETP-ALL-03/renv.lock | 9 +- analyses/hello-clusters/renv.lock | 6 +- 3 files changed, 355 insertions(+), 11 deletions(-) diff --git a/analyses/cell-type-ETP-ALL-03/renv.lock b/analyses/cell-type-ETP-ALL-03/renv.lock index 7d9ff86bb..8ef69e8a3 100644 --- a/analyses/cell-type-ETP-ALL-03/renv.lock +++ b/analyses/cell-type-ETP-ALL-03/renv.lock @@ -211,6 +211,13 @@ ], "Hash": "ed5a67b4c7ae01edd46809f1387adbee" }, + "HiddenMarkov": { + "Package": "HiddenMarkov", + "Version": "1.8-13", + "Source": "Repository", + "Repository": "RSPM", + "Hash": "26d4e106f5429773167ccf8f55581cdd" + }, "IRanges": { "Package": "IRanges", "Version": "2.38.1", @@ -682,6 +689,18 @@ ], "Hash": "2f6c8cc972ed6aee07c96e3dff729d15" }, + "TH.data": { + "Package": "TH.data", + "Version": "1.1-2", + "Source": "Repository", + "Repository": "RSPM", + "Requirements": [ + "MASS", + "R", + "survival" + ], + "Hash": "5b250ad4c5863ee4a68e280fcb0a3600" + }, "UCSC.utils": { "Package": "UCSC.utils", "Version": "1.0.0", @@ -725,6 +744,38 @@ ], "Hash": "2288423bb0f20a457800d7fc47f6aa54" }, + "ape": { + "Package": "ape", + "Version": "5.8", + "Source": "Repository", + "Repository": "RSPM", + "Requirements": [ + "R", + "Rcpp", + "digest", + "graphics", + "lattice", + "methods", + "nlme", + "parallel", + "stats", + "utils" + ], + "Hash": "16b5ff4dff0ead9ea955f62f794b1535" + }, + "argparse": { + "Package": "argparse", + "Version": "2.2.3", + "Source": "Repository", + "Repository": "RSPM", + "Requirements": [ + "R", + "R6", + "findpython", + "jsonlite" + ], + "Hash": "e575af52e22a8e91174473809cfe107d" + }, "askpass": { "Package": "askpass", "Version": "1.2.0", @@ -861,6 +912,27 @@ ], "Hash": "61e097f35917d342622f21cdc79c256e" }, + "coin": { + "Package": "coin", + "Version": "1.4-3", + "Source": "Repository", + "Repository": "RSPM", + "Requirements": [ + "R", + "libcoin", + "matrixStats", + "methods", + "modeltools", + "multcomp", + "mvtnorm", + "parallel", + "stats", + "stats4", + "survival", + "utils" + ], + "Hash": "4084b5070a40ad99dad581ed3b67bd55" + }, "colorspace": { "Package": "colorspace", "Version": "2.1-1", @@ -989,6 +1061,22 @@ ], "Hash": "24754fce82729ff85317dd195b6646a8" }, + "dendextend": { + "Package": "dendextend", + "Version": "1.18.1", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "datasets", + "ggplot2", + "magrittr", + "stats", + "utils", + "viridis" + ], + "Hash": "735689b7975ad5a4d72b571857d60a33" + }, "digest": { "Package": "digest", "Version": "0.6.37", @@ -1014,6 +1102,20 @@ ], "Hash": "e0dff489d999029c03330f063668e590" }, + "doParallel": { + "Package": "doParallel", + "Version": "1.0.17", + "Source": "Repository", + "Repository": "RSPM", + "Requirements": [ + "R", + "foreach", + "iterators", + "parallel", + "utils" + ], + "Hash": "451e5edf411987991ab6a5410c45011f" + }, "dotCall64": { "Package": "dotCall64", "Version": "1.1-1", @@ -1060,6 +1162,23 @@ ], "Hash": "6d7b942d8f615705f89a7883998fc839" }, + "edgeR": { + "Package": "edgeR", + "Version": "4.2.2", + "Source": "Bioconductor", + "Repository": "Bioconductor 3.19", + "Requirements": [ + "R", + "Rcpp", + "graphics", + "limma", + "locfit", + "methods", + "stats", + "utils" + ], + "Hash": "4c31c0395110252e4ec7cf4ee9cbebb6" + }, "evaluate": { "Package": "evaluate", "Version": "1.0.0", @@ -1102,6 +1221,16 @@ ], "Hash": "dc256683a45e31f9dc553440b909f198" }, + "fastcluster": { + "Package": "fastcluster", + "Version": "1.2.6", + "Source": "Repository", + "Repository": "RSPM", + "Requirements": [ + "R" + ], + "Hash": "2ed9ecb93023f39a449726ed4d43dff8" + }, "fastmap": { "Package": "fastmap", "Version": "1.2.0", @@ -1109,6 +1238,13 @@ "Repository": "CRAN", "Hash": "aa5e1cd11c2d15497494c5292d7ffcc8" }, + "findpython": { + "Package": "findpython", + "Version": "1.0.8", + "Source": "Repository", + "Repository": "RSPM", + "Hash": "8f9aa3ce842296afaad4083b839481a1" + }, "fitdistrplus": { "Package": "fitdistrplus", "Version": "1.2-1", @@ -1153,6 +1289,19 @@ ], "Hash": "1a0a9a3d5083d0d573c4214576f1e690" }, + "foreach": { + "Package": "foreach", + "Version": "1.5.2", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "codetools", + "iterators", + "utils" + ], + "Hash": "618609b42c9406731ead03adf5379850" + }, "formatR": { "Package": "formatR", "Version": "1.14", @@ -1508,6 +1657,53 @@ ], "Hash": "c3b7d801d722e26e4cd888e042bf9af5" }, + "infercnv": { + "Package": "infercnv", + "Version": "1.20.0", + "Source": "Bioconductor", + "Repository": "Bioconductor 3.19", + "Requirements": [ + "BiocGenerics", + "HiddenMarkov", + "Matrix", + "R", + "RANN", + "RColorBrewer", + "Seurat", + "SingleCellExperiment", + "SummarizedExperiment", + "ape", + "argparse", + "caTools", + "coda", + "coin", + "digest", + "doParallel", + "dplyr", + "edgeR", + "fastcluster", + "fitdistrplus", + "foreach", + "futile.logger", + "future", + "ggplot2", + "gplots", + "grDevices", + "graphics", + "gridExtra", + "igraph", + "methods", + "parallel", + "parallelDist", + "phyclust", + "reshape2", + "rjags", + "stats", + "tidyr", + "utils" + ], + "Hash": "eaf21e1aab39c0b466304b316cc8d031" + }, "irlba": { "Package": "irlba", "Version": "2.3.5.1", @@ -1532,6 +1728,17 @@ ], "Hash": "0080607b4a1a7b28979aecef976d8bc2" }, + "iterators": { + "Package": "iterators", + "Version": "1.0.14", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "utils" + ], + "Hash": "8954069286b4b2b0d023d1b288dce978" + }, "jquerylib": { "Package": "jquerylib", "Version": "0.1.4", @@ -1653,6 +1860,18 @@ ], "Hash": "b21c4ae2bb7935504c42bcdf749c04e6" }, + "libcoin": { + "Package": "libcoin", + "Version": "1.0-10", + "Source": "Repository", + "Repository": "RSPM", + "Requirements": [ + "R", + "mvtnorm", + "stats" + ], + "Hash": "3f3775a14588ff5d013e5eab4453bf28" + }, "lifecycle": { "Package": "lifecycle", "Version": "1.0.4", @@ -1666,6 +1885,22 @@ ], "Hash": "b8552d117e1b808b09a832f589b79035" }, + "limma": { + "Package": "limma", + "Version": "3.60.6", + "Source": "Bioconductor", + "Repository": "Bioconductor 3.19", + "Requirements": [ + "R", + "grDevices", + "graphics", + "methods", + "statmod", + "stats", + "utils" + ], + "Hash": "0eccf07d5db97b84a912922e1d29e130" + }, "linprog": { "Package": "linprog", "Version": "0.9-4", @@ -1700,6 +1935,17 @@ ], "Hash": "c6fafa6cccb1e1dfe7f7d122efd6e6a7" }, + "locfit": { + "Package": "locfit", + "Version": "1.5-9.10", + "Source": "Repository", + "Repository": "RSPM", + "Requirements": [ + "R", + "lattice" + ], + "Hash": "7d8e0ac914051ca0254332387d9b5816" + }, "lpSolve": { "Package": "lpSolve", "Version": "5.6.21", @@ -1816,6 +2062,34 @@ ], "Hash": "2b9414057d7f3725130e2f743ea05a2f" }, + "modeltools": { + "Package": "modeltools", + "Version": "0.2-23", + "Source": "Repository", + "Repository": "RSPM", + "Requirements": [ + "methods", + "stats", + "stats4" + ], + "Hash": "f5a957c02222589bdf625a67be68b2a9" + }, + "multcomp": { + "Package": "multcomp", + "Version": "1.4-26", + "Source": "Repository", + "Repository": "RSPM", + "Requirements": [ + "TH.data", + "codetools", + "graphics", + "mvtnorm", + "sandwich", + "stats", + "survival" + ], + "Hash": "ec6f951a557132215fab91912acdd9ef" + }, "munsell": { "Package": "munsell", "Version": "0.5.1", @@ -1827,6 +2101,17 @@ ], "Hash": "4fd8900853b746af55b81fda99da7695" }, + "mvtnorm": { + "Package": "mvtnorm", + "Version": "1.3-2", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "stats" + ], + "Hash": "9e8405eacb262c0a939e121650247f4b" + }, "nlme": { "Package": "nlme", "Version": "3.1-164", @@ -1917,6 +2202,17 @@ ], "Hash": "51e3a7a4af0b863e5d380575cbd33cda" }, + "phyclust": { + "Package": "phyclust", + "Version": "0.1-34", + "Source": "Repository", + "Repository": "RSPM", + "Requirements": [ + "R", + "ape" + ], + "Hash": "18a29354ea762dd01042d8697b7089d4" + }, "pillar": { "Package": "pillar", "Version": "1.9.0", @@ -2076,8 +2372,8 @@ "RemoteHost": "api.github.com", "RemoteUsername": "AlexsLemonade", "RemoteRepo": "rOpenScPCA", - "RemoteRef": "main", - "RemoteSha": "fc784446f8d86b072e6f7f67287adfff598f4911", + "RemoteRef": "f71a8191130fa543e6506c73c7b62ffa55e8ba3f", + "RemoteSha": "f71a8191130fa543e6506c73c7b62ffa55e8ba3f", "Requirements": [ "BiocParallel", "SingleCellExperiment", @@ -2089,7 +2385,7 @@ "tibble", "tidyr" ], - "Hash": "80a604c3be8af1ae30bcda4f96c4e290" + "Hash": "4b9dcd60f9ae2a2e1999acbd49d7b07a" }, "rappdirs": { "Package": "rappdirs", @@ -2169,6 +2465,17 @@ ], "Hash": "99e15369f8fb17dc188377234de13fc6" }, + "rjags": { + "Package": "rjags", + "Version": "4-16", + "Source": "Repository", + "Repository": "RSPM", + "Requirements": [ + "R", + "coda" + ], + "Hash": "a36ff5b8df160527e29037be8e1cdf7d" + }, "rlang": { "Package": "rlang", "Version": "1.1.4", @@ -2213,6 +2520,19 @@ ], "Hash": "4c8415e0ec1e29f3f4f6fc108bef0144" }, + "sandwich": { + "Package": "sandwich", + "Version": "3.1-1", + "Source": "Repository", + "Repository": "RSPM", + "Requirements": [ + "R", + "stats", + "utils", + "zoo" + ], + "Hash": "072bb2d27425f2a58fe71fe1080676ce" + }, "sass": { "Package": "sass", "Version": "0.4.9", @@ -2539,6 +2859,18 @@ ], "Hash": "69b26ceb9f7976f347049b4d470c2d65" }, + "statmod": { + "Package": "statmod", + "Version": "1.5.0", + "Source": "Repository", + "Repository": "RSPM", + "Requirements": [ + "R", + "graphics", + "stats" + ], + "Hash": "26e158d12052c279bdd4ba858b80fb1f" + }, "stringi": { "Package": "stringi", "Version": "1.8.4", @@ -2709,6 +3041,19 @@ ], "Hash": "c03fa420630029418f7e6da3667aac4a" }, + "viridis": { + "Package": "viridis", + "Version": "0.6.5", + "Source": "Repository", + "Repository": "RSPM", + "Requirements": [ + "R", + "ggplot2", + "gridExtra", + "viridisLite" + ], + "Hash": "acd96d9fa70adeea4a5a1150609b9745" + }, "viridisLite": { "Package": "viridisLite", "Version": "0.4.2", diff --git a/analyses/cell-type-nonETP-ALL-03/renv.lock b/analyses/cell-type-nonETP-ALL-03/renv.lock index 7ddc8099c..7a072e6cc 100644 --- a/analyses/cell-type-nonETP-ALL-03/renv.lock +++ b/analyses/cell-type-nonETP-ALL-03/renv.lock @@ -1121,7 +1121,6 @@ "RemoteSha": "d7d6569ae9e30bf774908301af312f626de4cbd5", "Requirements": [ "MCMCpack", - "R", "RColorBrewer", "cluster", "dlm", @@ -1130,7 +1129,7 @@ "parallel", "parallelDist" ], - "Hash": "e356046a6ab19635791f7ce46ecd5991" + "Hash": "efd05c69dffe1128eb4843f3107eb606" }, "cowplot": { "Package": "cowplot", @@ -2622,8 +2621,8 @@ "RemoteHost": "api.github.com", "RemoteUsername": "AlexsLemonade", "RemoteRepo": "rOpenScPCA", - "RemoteRef": "main", - "RemoteSha": "fc784446f8d86b072e6f7f67287adfff598f4911", + "RemoteRef": "f71a8191130fa543e6506c73c7b62ffa55e8ba3f", + "RemoteSha": "f71a8191130fa543e6506c73c7b62ffa55e8ba3f", "Requirements": [ "BiocParallel", "SingleCellExperiment", @@ -2635,7 +2634,7 @@ "tibble", "tidyr" ], - "Hash": "80a604c3be8af1ae30bcda4f96c4e290" + "Hash": "4b9dcd60f9ae2a2e1999acbd49d7b07a" }, "rappdirs": { "Package": "rappdirs", diff --git a/analyses/hello-clusters/renv.lock b/analyses/hello-clusters/renv.lock index 5636b53ee..6d9bc52b1 100644 --- a/analyses/hello-clusters/renv.lock +++ b/analyses/hello-clusters/renv.lock @@ -1860,8 +1860,8 @@ "RemoteHost": "api.github.com", "RemoteUsername": "AlexsLemonade", "RemoteRepo": "rOpenScPCA", - "RemoteRef": "main", - "RemoteSha": "fc784446f8d86b072e6f7f67287adfff598f4911", + "RemoteRef": "f71a8191130fa543e6506c73c7b62ffa55e8ba3f", + "RemoteSha": "f71a8191130fa543e6506c73c7b62ffa55e8ba3f", "Requirements": [ "BiocParallel", "SingleCellExperiment", @@ -1873,7 +1873,7 @@ "tibble", "tidyr" ], - "Hash": "80a604c3be8af1ae30bcda4f96c4e290" + "Hash": "4b9dcd60f9ae2a2e1999acbd49d7b07a" }, "rappdirs": { "Package": "rappdirs", From 80132e6c834e544d8ef89f55708e21b0bbc48739 Mon Sep 17 00:00:00 2001 From: Stephanie Spielman Date: Mon, 11 Nov 2024 11:43:27 -0500 Subject: [PATCH 5/6] missed argument name --- analyses/cell-type-ETP-ALL-03/scripts/05_cluster_evaluation.R | 2 +- .../cell-type-nonETP-ALL-03/scripts/05_cluster_evaluation.R | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/analyses/cell-type-ETP-ALL-03/scripts/05_cluster_evaluation.R b/analyses/cell-type-ETP-ALL-03/scripts/05_cluster_evaluation.R index 74bbec7cd..402a719ac 100644 --- a/analyses/cell-type-ETP-ALL-03/scripts/05_cluster_evaluation.R +++ b/analyses/cell-type-ETP-ALL-03/scripts/05_cluster_evaluation.R @@ -18,7 +18,7 @@ run_eval <- function(ind.lib) { summarise(avgSil = mean(silhouette_width), avgPur = mean(purity)) %>% data.frame() stability_df <- rOpenScPCA::calculate_stability( - x = seu, clusters = clusID.df, + x = seu, cluster_df = clusID.df, pc_name = "Xpca_", algorithm = "leiden", resolution = 1.0, objective_function = "modularity", seed = 10 diff --git a/analyses/cell-type-nonETP-ALL-03/scripts/05_cluster_evaluation.R b/analyses/cell-type-nonETP-ALL-03/scripts/05_cluster_evaluation.R index 1995ce421..f99b175cc 100644 --- a/analyses/cell-type-nonETP-ALL-03/scripts/05_cluster_evaluation.R +++ b/analyses/cell-type-nonETP-ALL-03/scripts/05_cluster_evaluation.R @@ -19,7 +19,7 @@ run_eval <- function(ind.lib) { summarise(avgSil = mean(silhouette_width), avgPur = mean(purity)) %>% data.frame() stability_df <- rOpenScPCA::calculate_stability( - x = seu, clusters = clusID.df, + x = seu, cluster_df = clusID.df, pc_name = "Xpca_", algorithm = "leiden", resolution = 1.0, objective_function = "modularity", seed = 10 From 346bf6b1cbabb46a04ce32f5eb98f884d4f0b05f Mon Sep 17 00:00:00 2001 From: Stephanie Spielman Date: Tue, 12 Nov 2024 12:32:41 -0500 Subject: [PATCH 6/6] mainify RemoteRef --- analyses/cell-type-ETP-ALL-03/renv.lock | 2 +- analyses/cell-type-nonETP-ALL-03/renv.lock | 2 +- analyses/hello-clusters/renv.lock | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/analyses/cell-type-ETP-ALL-03/renv.lock b/analyses/cell-type-ETP-ALL-03/renv.lock index 8ef69e8a3..ddf5508da 100644 --- a/analyses/cell-type-ETP-ALL-03/renv.lock +++ b/analyses/cell-type-ETP-ALL-03/renv.lock @@ -2372,7 +2372,7 @@ "RemoteHost": "api.github.com", "RemoteUsername": "AlexsLemonade", "RemoteRepo": "rOpenScPCA", - "RemoteRef": "f71a8191130fa543e6506c73c7b62ffa55e8ba3f", + "RemoteRef": "main", "RemoteSha": "f71a8191130fa543e6506c73c7b62ffa55e8ba3f", "Requirements": [ "BiocParallel", diff --git a/analyses/cell-type-nonETP-ALL-03/renv.lock b/analyses/cell-type-nonETP-ALL-03/renv.lock index 7a072e6cc..b2fcd483d 100644 --- a/analyses/cell-type-nonETP-ALL-03/renv.lock +++ b/analyses/cell-type-nonETP-ALL-03/renv.lock @@ -2621,7 +2621,7 @@ "RemoteHost": "api.github.com", "RemoteUsername": "AlexsLemonade", "RemoteRepo": "rOpenScPCA", - "RemoteRef": "f71a8191130fa543e6506c73c7b62ffa55e8ba3f", + "RemoteRef": "main", "RemoteSha": "f71a8191130fa543e6506c73c7b62ffa55e8ba3f", "Requirements": [ "BiocParallel", diff --git a/analyses/hello-clusters/renv.lock b/analyses/hello-clusters/renv.lock index 6d9bc52b1..06a8a8f31 100644 --- a/analyses/hello-clusters/renv.lock +++ b/analyses/hello-clusters/renv.lock @@ -1860,7 +1860,7 @@ "RemoteHost": "api.github.com", "RemoteUsername": "AlexsLemonade", "RemoteRepo": "rOpenScPCA", - "RemoteRef": "f71a8191130fa543e6506c73c7b62ffa55e8ba3f", + "RemoteRef": "main", "RemoteSha": "f71a8191130fa543e6506c73c7b62ffa55e8ba3f", "Requirements": [ "BiocParallel",