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

 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"),

NEWS.md

+# 1.1.4
+
+* Fix group factors bug
+
 # 1.1.3
 
 * Add verbose option to scDDEstimate

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")