Pass effort to format_driors()

sofia-taf · Feb 13, 2022 · f269d8b · f269d8b
1 parent a254850
commit f269d8b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: SOFIA
-Version: 1.0.2
-Date: 2022-01-24
+Version: 1.0.3
+Date: 2022-02-14
 Title: Tools to Work with SOFIA Analyses
 Authors@R: c(person("Rishi", "Sharma", role="aut"),
              person("Arni", "Magnusson", role=c("aut","cre"), email="[email protected]"))

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,10 @@
+# SOFIA 1.0.3 (2022-02-14)
+
+* Improved addDriors() so effort data are passed to format_driors().
+
+
+
+
 # SOFIA 1.0.2 (2022-01-24)
 
 * Initial release.
diff --git a/R/addDriors.R b/R/addDriors.R
@@ -66,7 +66,7 @@ addDriors <- function(stocks, priors, stocks.combined, shape_prior=2,
       b_ref_type = "k",
       terminal_state = priors$terminal_state[p],
       terminal_state_cv = priors$terminal_state_cv[p],
-      effort = na.omit(stocks$data[[i]])[[stocks$taxa[i]]],
+      effort = na.omit(stocks$data[[i]])$effort,
       effort_years = na.omit(stocks$data[[i]])$year,
       growth_rate_prior = NA,
       growth_rate_prior_cv = 0.2,