Merge pull request #295 from xoopR/fix_c_consistency

Closes #294

Author: RaphaelS1

DESCRIPTION

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

NEWS.md

@@ -1,3 +1,7 @@
+# distr6 1.8.3
+
+* Add `decorators` argument to `c.Matdist` and `c.Arrdist`
+
 # distr6 1.8.1
 
 * Add 'transformer' functions `pdfcdf` and `cdfpdf`, which use Rcpp to transform matrics/arrays/vectors between pdf->cdf and cdf->pdf respectively.

R/SDistribution_Arrdist.R

@@ -372,6 +372,7 @@ Arrdist <- R6Class("Arrdist",
 #' @title Combine Array Distributions into a Arrdist
 #' @description Helper function for quickly combining distributions into a [Arrdist].
 #' @param ... array distributions to be concatenated.
+#' @param decorators If supplied then adds given decorators, otherwise pulls them from underlying distributions.
 #' @return [Arrdist]
 #' @examples
 #' # create three array distributions with different column names
@@ -383,13 +384,17 @@ Arrdist <- R6Class("Arrdist",
 #' })
 #' do.call(c, arr)
 #' @export
-c.Arrdist <- function(...) {
+c.Arrdist <- function(..., decorators = NULL) {
   # get the pdfs and decorators
   pdfdec <- unlist(lapply(list(...), function(x) list(gprm(x, "pdf"), x$decorators)),
     recursive = FALSE
   )
   pdfs <- pdfdec[seq.int(1, length(pdfdec), by = 2)]
-  decs <- unique(unlist(pdfdec[seq.int(2, length(pdfdec), by = 2)]))
+
+
+  if (is.null(decorators)) {
+    decorators <- unique(unlist(pdfdec[seq.int(2, length(pdfdec), by = 2)]))
+  }
 
   nt <- unique(vapply(pdfs, function(.x) dim(.x)[3L], integer(1)))
   if (length(nt) > 1) {
@@ -399,7 +404,7 @@ c.Arrdist <- function(...) {
   pdfs <- .merge_arrpdf_cols(pdfs)
   pdfs <- do.call(abind::abind, list(what = pdfs, along = 1))
 
-  as.Distribution(pdfs, fun = "pdf", decorators = decs)
+  as.Distribution(pdfs, fun = "pdf", decorators = decorators)
 }
 
 #' @title Extract one or more Distributions from an Array distribution

R/SDistribution_Matdist.R

@@ -335,6 +335,7 @@ Matdist <- R6Class("Matdist",
 #' @title Combine Matrix Distributions into a Matdist
 #' @description Helper function for quickly combining distributions into a [Matdist].
 #' @param ... matrix distributions to be concatenated.
+#' @param decorators If supplied then adds given decorators, otherwise pulls them from underlying distributions.
 #' @return [Matdist]
 #' @examples
 #' # create three matrix distributions with different column names
@@ -346,16 +347,20 @@ Matdist <- R6Class("Matdist",
 #' })
 #' do.call(c, mats)
 #' @export
-c.Matdist <- function(...) {
+c.Matdist <- function(..., decorators = NULL) {
   # get the pdfs and decorators
   pdfdec <- unlist(lapply(list(...), function(x) list(gprm(x, "pdf"), x$decorators)),
     recursive = FALSE
   )
   pdfs <- pdfdec[seq.int(1, length(pdfdec), by = 2)]
-  decs <- unique(unlist(pdfdec[seq.int(2, length(pdfdec), by = 2)]))
+
+  if (is.null(decorators)) {
+    decorators <- unique(unlist(pdfdec[seq.int(2, length(pdfdec), by = 2)]))
+  }
+
 
   as.Distribution(do.call(rbind, .merge_matpdf_cols(pdfs)), fun = "pdf",
-                  decorators = decs)
+                  decorators = decorators)
 }
 
 #' @title Extract one or more Distributions from a Matdist