Bug in Arith FLArray/FLPar, thanks TB

flr · Apr 12, 2024 · 5ceb239 · 5ceb239
1 parent 1077adb
commit 5ceb239
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
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.9010
+Version: 2.6.20.9100
 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/FLPar.R b/R/FLPar.R
@@ -528,8 +528,14 @@ setMethod("Arith", ##  "+", "-", "*", "^", "%%", "%/%", "/"
 #' @examples
 #' # FLQuant and FLPar
 #' flq / flp
+
 setMethod("Arith", signature(e1 = "FLArray", e2 = "FLPar"),
   function(e1, e2) {
+
+    # BUG: USING %op%
+    op <- as.character(get('.Generic'))
+    return(do.call(paste0("%", op, "%"), list(e1, e2)))
+
     # objects dims
     d1 <- dim(e1)
     d2 <- dim(e2)
@@ -570,6 +576,11 @@ setMethod("Arith", signature(e1 = "FLArray", e2 = "FLPar"),
 #' @rdname Arith-methods
 setMethod("Arith", signature(e1 = "FLPar", e2 = "FLArray"),
   function(e1, e2) {
+
+    # BUG: USING %op%
+    op <- as.character(get('.Generic'))
+    return(do.call(paste0("%", op, "%"), list(e1, e2)))
+
     # objects dims
     d1 <- dim(e1)
     d2 <- dim(e2)