diff --git a/DESCRIPTION b/DESCRIPTION index 5a1c60ca93647865a72c62412e9d6f11df3aebc1..2f30b33373b0035637419a46a44ec1c93dc1f5c8 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: splatter Type: Package Title: Simple Simulation of Single-cell RNA Sequencing Data -Version: 1.9.6 -Date: 2019-09-17 +Version: 1.9.7 +Date: 2019-09-19 Author: Luke Zappia Authors@R: c(person("Luke", "Zappia", role = c("aut", "cre"), diff --git a/NEWS.md b/NEWS.md index fba5bbb0789589ea208b15bb19e5ce1072ab6203..283654bbce89a1e6085247f499e85fd1bad18873 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +## Version 1.9.7 (2019-09-19) + +* Rescale when sampling Phi in BASiCSSimulate + ## Version 1.9.6 (2019-09-17) * Adjust BASiCSSimulate to match development version of BASiCS diff --git a/R/BASiCS-simulate.R b/R/BASiCS-simulate.R index 345ba5bd08099134466a1d14674f688582bdb7a6..2b5ab176af7ef79a0a7cbc05b2e796c4e4396313 100644 --- a/R/BASiCS-simulate.R +++ b/R/BASiCS-simulate.R @@ -72,6 +72,8 @@ BASiCSSimulate <- function(params = newBASiCSParams(), verbose = TRUE, ...) { "spike.means will be sampled.") selected <- sample(length(spike.mu), nSpikes, replace = TRUE) spike.mu <- spike.mu[selected] + + params <- setParam(params, "spike.mu", spike.mu) } } @@ -81,6 +83,10 @@ BASiCSSimulate <- function(params = newBASiCSParams(), verbose = TRUE, ...) { "cell.params will be sampled.") selected <- sample(nrow(cell.params), nCells, replace = TRUE) cell.params <- cell.params[selected, ] + + cell.params$Phi <- (cell.params$Phi / sum(cell.params$Phi)) * nCells + + params <- setParam(params, "cell.params", cell.params) } thetas <- getParam(params, "theta")