diff --git a/DESCRIPTION b/DESCRIPTION index 99a0c1b5..354322a7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: FLCore Title: Core Package of FLR, Fisheries Modelling in R -Version: 2.6.20.9317 +Version: 2.6.20.9318 Authors@R: c( person("Iago", "Mosqueira", email = "iago.mosqueira@wur.nl", role = "cre", comment=c(c(ORCID = "0000-0002-3252-0591"))), diff --git a/R/genericMethods.R b/R/genericMethods.R index e948365a..1767bb55 100644 --- a/R/genericMethods.R +++ b/R/genericMethods.R @@ -1251,15 +1251,21 @@ setGeneric("distribution", function(object, ...) setGeneric("distribution<-", function(object, ..., value) standardGeneric("distribution<-")) -# combine +# combine {{{ setGeneric('combine', function(x, y, ...) standardGeneric('combine')) setMethod('combine', signature(x='NULL', y='NULL'), - function(x,y,...) { + function(x, y, ...) { return(NULL) }) +setMethod('combine', signature(x='list', y='list'), + function(x, y, ...) + c(x, y, list(...)) +) +# }}} + # jackknife setGeneric("jackknife", function(object, ...) standardGeneric("jackknife"))