Fix bioc error

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: SuperCellCyto
 Title: SuperCell For Cytometry Data
-Version: 0.99.0
+Version: 0.99.1
 Authors@R: c(
     person("Givanna", "Putri", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7399-8014"), email = "givanna.h@gmail.com"),
     person("George", "Howitt", role = "aut"),

NEWS.md

@@ -1,3 +1,9 @@
+# SuperCellCyto 0.99.1
+
+* Changed `paste` to `sprintf` for warning messages.
+* Moved example data to `inst/extdata` and update vignettes.
+* Add chunk labels to vignettes.
+
 # SuperCellCyto 0.99.0
 
 ## Major changes

R/runSuperCellCyto.R

@@ -256,10 +256,9 @@ runSuperCellCyto <- function(
 .adjust_n_pc <- function(n_pc, markers) {
     if (n_pc > length(markers)) {
         warning(
-            paste0(
-                "Requested n_pc (", n_pc,
-                ") is greater than the number of markers (", length(markers),
-                "). Setting n_pc to ", length(markers), "."
+            sprintf(
+                "n_pc (%d) > number of markers (%d). Setting n_pc to %d.",
+                n_pc, length(markers), length(markers)
             )
         )
         n_pc <- length(markers)

vignettes/how_to_create_supercells.Rmd

@@ -16,7 +16,7 @@ knitr::opts_chunk$set(
 )
 ```
 
-```{r setup, echo=FALSE, message=FALSE}
+```{r load_packages, echo=FALSE, message=FALSE}
 library(SuperCellCyto)
 library(parallel)
 library(BiocParallel)
@@ -61,7 +61,7 @@ with each sample containing 10,000 cells.
 Hence in total, we will have a toy dataset containing 15 markers and 
 30,000 cells.
 
-```{r}
+```{r simulate_data}
 n_markers <- 15
 n_samples <- 3
 dat <- simCytoData(nmarkers = n_markers, ncells = rep(10000, n_samples))
@@ -71,7 +71,7 @@ head(dat)
 For our toy dataset, we will transform our data using arcsinh transformation.
 We will use the base R `asinh` function to do this:
 
-```{r}
+```{r arcsinh_transformation}
 # Specify which columns are the markers to transform
 marker_cols <- paste0("Marker_", seq_len(n_markers))
 # The co-factor for arc-sinh
@@ -94,7 +94,7 @@ We will also create a column *Cell_id_dummy* which uniquely identify each cell.
 It will have values such as `Cell_1, Cell_2,` all the way until `Cell_x`
 where x is the number of cells in the dataset.
 
-```{r}
+```{r create_cell_id}
 dat$Cell_id_dummy <- paste0("Cell_", seq_len(nrow(dat)))
 head(dat$Cell_id_dummy, n = 10)
 ```
@@ -103,13 +103,13 @@ By default, the `simCytoData` function will generate cells for multiple samples,
 and that the resulting `data.table` object will already have a column 
 called *Sample* that denotes the sample the cells come from.
 
-```{r}
+```{r check_sample_col}
 unique(dat$Sample)
 ```
 
 Let's take note of the sample and cell id column for later.
 
-```{r}
+```{r set_colnames}
 sample_col <- "Sample"
 cell_id_col <- "Cell_id_dummy"
 ```
@@ -131,7 +131,7 @@ your data, then make sure you specify them in a vector that you later pass to
 For this tutorial, we will use all the arcsinh transformed markers in the 
 toy data.
 
-```{r}
+```{r run_supercellcyto}
 supercells <- runSuperCellCyto(
     dt = dat,
     markers = marker_cols_asinh,
@@ -142,13 +142,13 @@ supercells <- runSuperCellCyto(
 
 Let's dig deeper into the object it created:
 
-```{r}
+```{r check_supercells_class}
 class(supercells)
 ```
 
 It is a list containing 3 elements:
 
-```{r}
+```{r check_supercells_names}
 names(supercells)
 ```
 
@@ -171,7 +171,7 @@ supercell.
 These are calculated by taking the average of the marker expression of 
 all the cells contained within a supercell.
 
-```{r}
+```{r show_supercell_expr_matrix}
 head(supercells$supercell_expression_matrix)
 ```
 
@@ -188,7 +188,7 @@ variable).
 
 Let's have a look at `SuperCellId`:
 
-```{r}
+```{r show_supercell_ids}
 head(unique(supercells$supercell_expression_matrix$SuperCellId))
 ```
 
@@ -198,7 +198,7 @@ a sample) used to uniquely identify each supercell in a sample.
 Notably, you may encounter this (`SuperCell_1`, `SuperCell_2`) being repeated
 across different samples, e.g.,
 
-```{r}
+```{r show_supercell_1_ids}
 supercell_ids <- unique(supercells$supercell_expression_matrix$SuperCellId)
 supercell_ids[grep("SuperCell_1_", supercell_ids)]
 ```
@@ -217,7 +217,7 @@ This aids in differentiating the supercells in different samples.
 `supercell_cell_map` maps each cell in our dataset to the supercell it 
 belongs to.
 
-```{r}
+```{r show_supercell_cell_map}
 head(supercells$supercell_cell_map)
 ```
 
@@ -244,7 +244,7 @@ As each sample will be processed by a parallel job, we don't want a job that
 processs large sample to also be assigned other smaller samples if possible.
 If you want to know more how this feature works, please refer to our manuscript.
 
-```{r}
+```{r run_supercellcyto_parallel}
 supercell_par <- runSuperCellCyto(
     dt = dat,
     markers = marker_cols_asinh,
@@ -307,7 +307,7 @@ toy dataset, we will regenerate the supercells using gamma of 10 and 50.
 The function to do this is `recomputeSupercells`.
 We will store the output in a list, one element per gamma value.
 
-```{r}
+```{r recompute_supercells}
 addt_gamma_vals <- c(10, 50)
 supercells_addt_gamma <- lapply(addt_gamma_vals, function(gam) {
     recomputeSupercells(
@@ -325,7 +325,7 @@ We should end up with a list containing 2 elements.
 The 1st element contains supercells generated using gamma = 10,
 and the 2nd contains supercells generated using gamma = 50.
 
-```{r}
+```{r show_supercells_gamma10}
 supercells_addt_gamma[[1]]
 ```
 
@@ -341,7 +341,7 @@ Compared to the previous run where gamma was set to 20, we should get more
 supercells for gamma = 10, and less for gamma = 50.
 Let's see if that's the case.
 
-```{r}
+```{r count_supercells}
 n_supercells_gamma20 <- nrow(supercells$supercell_expression_matrix)
 n_supercells_gamma10 <- nrow(
     supercells_addt_gamma[[1]]$supercell_expression_matrix
@@ -351,11 +351,11 @@ n_supercells_gamma50 <- nrow(
 )
 ```
 
-```{r}
+```{r gamma10_gt_gamma20}
 n_supercells_gamma10 > n_supercells_gamma20
 ```
 
-```{r}
+```{r gamma50_lt_gamma20}
 n_supercells_gamma50 < n_supercells_gamma20
 ```
 
@@ -369,7 +369,7 @@ and run `runSuperCellCyto`
 function on each of them with different `gam` parameter value.
 Something like the following:
 
-```{r}
+```{r diff_gamma_per_sample}
 n_markers <- 10
 dat <- simCytoData(nmarkers = n_markers)
 markers_col <- paste0("Marker_", seq_len(n_markers))
@@ -397,7 +397,7 @@ supercells_diff_gam <- lapply(seq_len(length(samples)), function(i) {
 Subsequently, to extract and combine the `supercell_expression_matrix` and
 `supercell_cell_map`, we will need to use `rbind`:
 
-```{r}
+```{r combine_supercell_results}
 supercell_expression_matrix <- do.call(
     "rbind", lapply(
         supercells_diff_gam, function(x) x[["supercell_expression_matrix"]]
@@ -411,14 +411,14 @@ supercell_cell_map <- do.call(
 )
 ```
 
-```{r}
+```{r show_combined_expr_matrix}
 rbind(
     head(supercell_expression_matrix, n = 3),
     tail(supercell_expression_matrix, n = 3)
 )
 ```
 
-```{r}
+```{r show_combined_cell_map}
 rbind(head(supercell_cell_map, n = 3), tail(supercell_cell_map, n = 3))
 ```
 
@@ -463,6 +463,6 @@ load the relevant output saved using the qs package and the relevant data
 `recomputeSupercells` function.
 
 ## Session information
-```{r}
+```{r session_info}
 sessionInfo()
 ```

vignettes/how_to_prepare_data.Rmd

@@ -9,7 +9,7 @@ vignette: >
   %\VignetteEncoding{UTF-8}
 ---
 
-```{r, include = FALSE}
+```{r setup, include = FALSE}
 knitr::opts_chunk$set(
     collapse = TRUE,
     comment = "#>"
@@ -59,7 +59,7 @@ For Oetjen_bcell data, we used the following gating strategy post compensation:
 The following is the resulting single live cells manually gated for the 
 `Oetjen_bcell` data.
 
-```{r}
+```{r add_fig}
 knitr::include_graphics(
     "figures/oetjen_bcell_single_live_cells.png", 
     error = FALSE
@@ -131,7 +131,7 @@ We can use the `fread` function from the `data.table` package.
 
 Here's how to install it:
 
-```{r eval=FALSE}
+```{r install_datatable, eval=FALSE}
 install.packages("data.table")
 ```
 
@@ -140,10 +140,18 @@ For this example, let's load two CSV files containing subsampled data from the
 Each file represents a sample (H1 and H2), with the sample name appended 
 to the file name:
 
-```{r}
+```{r load_csv_data}
 library(data.table)
 
-csv_files <- c("data/Levine_32dim_H1_sub.csv", "data/Levine_32dim_H2_sub.csv")
+csv_files <- c(
+    system.file(
+        "extdata", "Levine_32dim_H1_sub.csv", package = "SuperCellCyto"
+    ),
+    system.file(
+        "extdata", "Levine_32dim_H2_sub.csv", package = "SuperCellCyto"
+    )
+)
+
 samples <- c("H1", "H2")
 
 dat <- lapply(seq_len(length(samples)), function(i) {
@@ -166,8 +174,8 @@ Let's break down what we have done.
 
 We specify the location of the csv files in `csv_files` vector
 and their corresponding sample names in `samples` vector.
-`data/Levine_32dim_H1_sub.csv` belongs to sample H1 while 
-`data/Levine_32dim_H2_sub.csv` belongs to sample H2.
+`Levine_32dim_H1_sub.csv` belongs to sample H1 while 
+`Levine_32dim_H2_sub.csv` belongs to sample H2.
 
 We use `lapply` to simultaneously iterate over each element in the 
 `csv_files` and `samples` vector.
@@ -193,12 +201,14 @@ Let's load two small FCS files for the Anti-PD1 data from
 [FlowRepository](
 http://flowrepository.org/public_experiment_representations/1124).
 
-```{r}
+```{r load_fcs_data}
 library(flowCore)
 library(data.table)
 
 fs <- read.flowSet(
-    path = "data",
+    path = system.file(
+        "extdata", package = "SuperCellCyto"
+    ),
     pattern = "\\.fcs$"
 )
 
@@ -236,7 +246,7 @@ them into our `data.table` object.
 We will also to create a new column `cell_id` which gives each cell a 
 unique id such as `Cell_1`, `Cell_2`, etc.
 
-```{r}
+```{r add_sample_and_cellid}
 sample_info <- data.table(
     sample = c("patient9", "patient15"),
     file_name = c(
@@ -276,7 +286,7 @@ First, we need to select the markers to be transformed.
 Usually, all markers should be transformed for SuperCellCyto.
 However, you can choose to exclude specific markers if needed:
 
-```{r}
+```{r define_markers}
 markers <- c(
     "209Bi_CD11b", "162Dy_CD11c", "163Dy_CD7", "166Er_CD209", "167Er_CD38",
     "151Eu_CD123", "153Eu_CD62L", "152Gd_CD66b", "154Gd_ICAM-1", "155Gd_CD1c",
@@ -290,7 +300,7 @@ markers <- c(
 For transformation, we'll use a cofactor of 5 and apply the 
 arcsinh transformation.
 
-```{r}
+```{r arcsinh_transformation}
 new_cols <- paste0(markers, "_asinh")
 cf <- 5
 dat[, (new_cols) := lapply(.SD, function(x) asinh(x / cf)), .SDcols = markers]
@@ -306,7 +316,7 @@ Please refer to
 for detailed instructions.
 
 ## Session information
-```{r}
+```{r session_info}
 sessionInfo()
 ```