combine(FLoem) mde safer

flr · Dec 16, 2024 · 73604f6 · 73604f6
1 parent 23f05c3
commit 73604f6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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"))