update version, dstrs

 Branch: master

Author: Raphael Sonabend

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: distr6
 Title: The Complete R6 Probability Distributions Interface
-Version: 1.6.0
+Version: 1.5.0
 Authors@R:
       c(person(given = "Raphael",
              family = "Sonabend",

NEWS.md

@@ -1,26 +1,18 @@
-# distr6 1.6.0
-
-### Edited Functionality
-
-* The separator for composite (wrapped) distributions is now `__` (before `_`). This may affect backwards compatibility in rare cases.
-
-### Added Functionality
-
-* Added `length.VectorDistribution`
-* Added `ids` parameter to `VectorDistribution` to allow specifying names for wrapped distributions. Extended `extract.VectorDistribution` so these ids can be used for extraction.
-
 # distr6 1.5.0
 
 ### Minor Updates
 
 #### Added Functionality
 
+* Added `length.VectorDistribution`
+* Added `ids` parameter to `VectorDistribution` to allow specifying names for wrapped distributions. Extended `extract.VectorDistribution` so these ids can be used for extraction.
 * Added sugar function `dstr` to construct distributions more easily, e.g. `dstr("Binom", size = 4)` instead of `Binomial$new(size = 4)`.
 * Added sugar function `dstrs` to construct a `VectorDistribution` of distributions.
 * `ParameterSet` method `setParameterValue` now includes `resolveConflicts` parameter for resolving conflicts between conflicting parameters (see below). This should primarily only be used internally and is useful for transforming composite distributions.
 
 #### Edited Functionality
 
+* The separator for composite (wrapped) distributions is now `__` (before `_`). This may affect backwards compatibility in rare cases.
 * Construction and setting of parameters is now changed. Previously this relied on knowing a confusing hierarchy in parameters which would take priority over one another. Now if conflicting parameters are supplied in construction or on setting an error is returned, e.g. `Binomial$new(prob = 0.1, qprob = 0.2)` would cause an error. This may affect bacwards compatibility however should not do so if distributions are correctly constructed/updated without conflicts.
 * `setParameterValue` in `ParameterSet` no longer errors if a non-settable parameter is updated, instead a `warning` is given and the parameter is ignored.
 * Multivariate distributions no longer error if constructed with a single variate, though this is still advised against.

R/sugar.R

@@ -36,6 +36,9 @@
 #' dstrs(c("Binom", "Gamma"),
 #'      list(list(size = 4), list(rate = 2, shape = 3)))
 #'
+#' # Multiple Binomials
+#' dstrs("Binom", data.frame(size = 1:5))
+#'
 #' @export
 dstr <- function(d, ..., pars = NULL) {
   choices <- listDistributions()
@@ -57,6 +60,17 @@ dstr <- function(d, ..., pars = NULL) {
 #' @rdname dstr
 #' @export
 dstrs <- function(d, pars = NULL) {
-  if (is.null(pars)) pars <- vector("list", length(d))
-  VectorDistribution$new(mapply(dstr, d, pars = pars))
+
+  if (length(d) == 1) {
+    if (is.null(pars)) {
+      stop("pars' cannot be NULL if 'd' is length 1.")
+    } else {
+      VectorDistribution$new(distribution = d, params = pars)
+    }
+  } else {
+    if (is.null(pars)) {
+      pars <- vector("list", length(d))
+    }
+    VectorDistribution$new(mapply(dstr, d, pars = pars))
+  }
 }

man/dstr.Rd

@@ -17,4 +17,7 @@ test_that("dstrs", {
   v <- dstrs(c("Binom", "Gamma"), list(list(size = 4), list(rate = 2, shape = 3)))
   expect_equal(v[1]$strprint(), "Binom(prob = 0.5, qprob = 0.5, size = 4)")
   expect_equal(v[2]$strprint(), "Gamma(shape = 3, rate = 2, scale = 0.5, mean = 1.5)")
+  v <- dstrs("Binom", data.frame(size = 1:2))
+  expect_equal(v[1]$strprint(), "Binom(prob = 0.5, qprob = 0.5, size = 1)")
+  expect_equal(v[2]$strprint(), "Binom(prob = 0.5, qprob = 0.5, size = 2)")
 })