Fixed window(FLPar)

flr · Dec 10, 2024 · 89bfd8a · 89bfd8a
1 parent 5e45dbe
commit 89bfd8a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 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.9310
+Version: 2.6.20.9311
 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
@@ -1038,10 +1038,10 @@ setMethod("window", signature(x="FLPar"),
     res <- do.call(class(x), list(NA, units=units(x), dimnames=dnames))
 
     # add data for matching years
-    dnames <- dnames[pos]
+    dnames <- dimnames(x)[pos]
     names(dnames) <- c('i', 'j', 'k', 'l', 'm', 'n')[pos]
 
-    do.call('[<-', c(list(x=res, value=x), dimnames))
+    do.call('[<-', c(list(x=res, value=x), dnames))
   }
 )   # }}}
 

diff --git a/R/FLStockR.R b/R/FLStockR.R
@@ -183,15 +183,6 @@ setReplaceMethod("sr", signature(object="FLStockR", value="FLQuants"),
 
 # }}}
 
-# depletion {{{
-
-setMethod("depletion", signature(x="FLStockR"),
-  function(x, B0=refpts(x)$SB0) {
-    unitSums(ssb(x)) / c(B0)
-  }
-)
-# }}}
-
 # predict
 
 # ffwd
@@ -212,7 +203,6 @@ setAs('FLStockR', 'FLStock',
 
 setMethod("depletion", signature(x="FLStockR"),
   function(x, SB0=refpts(x)$SB0) {
-browser()
     if(is.character(SB0))
       SB0 <- refpts(x)[SB0,]