From 61e88c6e64f81481481e1c048c1e33d367b76d7e Mon Sep 17 00:00:00 2001
From: Luke Zappia <luke.zappia@mcri.edu.au>
Date: Fri, 4 Aug 2017 03:52:29 +0000
Subject: [PATCH] Merge branch 'master' into devel
* master:
Fix group factors bug
From: Luke Zappia <lazappi@users.noreply.github.com>
git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/splatter@131740 bc3139a8-67e5-0310-9ffc-ced21a209358
---
DESCRIPTION | 4 ++--
NEWS.md | 4 ++++
R/splat-simulate.R | 3 +--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index c3b526b..304ab01 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
Package: splatter
Type: Package
Title: Simple Simulation of Single-cell RNA Sequencing Data
-Version: 1.1.3
-Date: 2017-07-20
+Version: 1.1.4
+Date: 2017-08-04
Author: Luke Zappia
Authors@R:
c(person("Luke", "Zappia", role = c("aut", "cre"),
diff --git a/NEWS.md b/NEWS.md
index 36c1579..99263ac 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,7 @@
+# 1.1.4
+
+* Fix group factors bug
+
# 1.1.3
* Add verbose option to scDDEstimate
diff --git a/R/splat-simulate.R b/R/splat-simulate.R
index e129beb..5256804 100644
--- a/R/splat-simulate.R
+++ b/R/splat-simulate.R
@@ -501,7 +501,7 @@ splatSimGroupCellMeans <- function(sim, params) {
cell.names <- pData(sim)$Cell
gene.names <- fData(sim)$Gene
groups <- pData(sim)$Group
- group.names <- unique(groups)
+ group.names <- sort(unique(groups))
exp.lib.sizes <- pData(sim)$ExpLibSize
batch.means.cell <- get_exprs(sim, "BatchCellMeans")
@@ -535,7 +535,6 @@ splatSimPathCellMeans <- function(sim, params) {
path.nonlinearProb <- getParam(params, "path.nonlinearProb")
path.sigmaFac <- getParam(params, "path.sigmaFac")
groups <- pData(sim)$Group
- group.names <- unique(groups)
exp.lib.sizes <- pData(sim)$ExpLibSize
batch.means.cell <- get_exprs(sim, "BatchCellMeans")
--
GitLab