v.0.5.2.9002

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: ss3om
 Title: Tools for Conditioning Fisheries Operating Models Using Stock Synthesis 3
-Version: 0.5.2.9001
+Version: 0.5.2.9002
 Authors@R: person("Iago", "Mosqueira", email = "[email protected]",
   role = c("aut", "cre"))
 Description: Tools for loading Stock Synthesis (SS3) models into FLR. Used in

NAMESPACE

@@ -5,7 +5,7 @@ import("mse")
 import("data.table")
 import("foreach")
 import("r4ss")
-importFrom("stats", "optimize", "setNames")
+importFrom("stats", "optimise", "setNames")
 
 export(
   "buildFLBFss3",

tests/testthat/test-ss330.R

@@ -152,7 +152,7 @@ test_that("hake FLStock is valid", {
 
 test_that("Calculated hake SSB matches that in Report.sso", {
   expect_comparable(
-    unitSums(ssb(hkes)),
+    seasonSums(unitSums(ssb(hkes))),
     extractSSB(hke))
   }
 )
@@ -161,7 +161,7 @@ test_that("Calculated hake SSB matches that in Report.sso", {
 
 test_that("Calculated hake annual F matches that in Report.sso", {
   expect_comparable(
-    unitMeans(fbar(hkes))[, -1],
+    fbar(simplify(hkes))[, -1],
     extractFbar(hke))
   }
 )
@@ -171,8 +171,8 @@ test_that("Calculated hake annual F matches that in Report.sso", {
 test_that("Calculated hake annual Z at age matches that in Report.sso", {
   expect_comparable(
     # LAST age not returned in Report.sso$Z_at_age
-    z(hkes)[ac(0:18),],
-    extractZatage(hke)[ac(0:18),])
+    z(simplify(hkes))[ac(0:14),],
+    extractZatage(hke)[ac(0:14),])
   }
 )
 # }}}