Merge branch 'master' into release-3.5

* master:
  Fix error handling when fitting means

From: Luke Zappia <lazappi@users.noreply.github.com>

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_3_5/madman/Rpacks/splatter@129584 bc3139a8-67e5-0310-9ffc-ced21a209358

DESCRIPTION

 Package: splatter
 Type: Package
 Title: Simple Simulation of Single-cell RNA Sequencing Data
-Version: 1.0.1
-Date: 2017-04-28
+Version: 1.0.2
+Date: 2017-05-15
 Author: Luke Zappia
 Authors@R:
     c(person("Luke", "Zappia", role = c("aut", "cre"),

NEWS.md

+# 1.0.2
+
+* Fix error handling when fitting means
+
 # 1.0.1
 
 * Fix scales in some difference plots

R/splat-estimate.R

@@ -81,9 +81,9 @@ splatEstMean <- function(norm.counts, params) {
 
     means <- winsorize(means, q = 0.1)
 
-    fit <- try(fitdistrplus::fitdist(means, "gamma", method = "mge",
-                                     gof = "CvM"))
-    if (class(fit) == "try-error") {
+    fit <- fitdistrplus::fitdist(means, "gamma", method = "mge",
+                                 gof = "CvM")
+    if (fit$convergence > 0) {
         warning("Goodness of fit failed, using Method of Moments")
         fit <- fitdistrplus::fitdist(means, "gamma", method = "mme")
     }