Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Imports:
ggplot2 (>= 4.0.0),
glue,
gt,
lifecycle,
purrr,
rlang,
scales,
Expand All @@ -61,9 +62,10 @@ Suggests:
testthat (>= 3.0.0)
VignetteBuilder:
knitr
Config/roxygen2/version: 8.1.0
Config/roxygen2/version: 8.1.1
Config/testthat/edition: 3
Config/testthat/parallel: false
Encoding: UTF-8
Language: en-US
LazyData: true
Roxygen: list(markdown = TRUE)
2 changes: 2 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Generated by roxygen2: do not edit by hand

export(calculate_reference_point)
export(convert_output)
export(create_latex_table)
export(create_rda)
Expand Down Expand Up @@ -35,3 +36,4 @@ export(table_projections)
export(table_total_catch)
export(theme_noaa)
export(theme_table)
importFrom(lifecycle,deprecated)
14 changes: 13 additions & 1 deletion R/convert_output.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#' Format stock assessment output file to a standardized tibble.
#'
#' @param file Path. Assessment model output file path. Currently accepts SS3
#' Report.sso file, BAM .rda file, Rceattle model object, and FIMS model object.
#' `r4ss::ss_output()` or Report.sso file (being deprecated), BAM .rda file, Rceattle model object, and FIMS model object.
#' @param model String. Assessment model used in evaluation
#'
#' Default: NULL
Expand Down Expand Up @@ -48,6 +48,18 @@ convert_output <- function(
fleet_names = NULL,
save_dir = NULL
) {

if (grepl("Report.sso", file)) {
lifecycle::deprecate_warn(
when = "2.8.0",
what = I("convert_output(file = 'Report.sso')"),
Comment thread
Schiano-NOAA marked this conversation as resolved.
details = c(
i = "Please use the returned object from `r4ss::ss_output()`",
i = "File will be compatible until Oct. 1, 2027"
)
)
}

# check if entered save_dir exists so doesn't waste user time finding this out at the end
if (!is.null(save_dir)) {
if (!grepl(".rda", save_dir)) {
Expand Down
1 change: 1 addition & 0 deletions R/stockplotr-package.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"_PACKAGE"

## usethis namespace: start
#' @importFrom lifecycle deprecated
## usethis namespace: end
NULL

Expand Down
9 changes: 7 additions & 2 deletions R/utils_plot.R
Original file line number Diff line number Diff line change
Expand Up @@ -875,8 +875,13 @@ get_id <- function(dat) {

#------------------------------------------------------------------------------

# Calculate reference value point

#' Calculate reference value point
#'
#' @inheritParams plot_spawning_biomass dat lbs
#' @param reference_name String. Name of the reference point (e.g. "spawning biomass msy")
#'
#' @returns the value of the reference point name found in the dat file.
#' @export
calculate_reference_point <- function(
dat,
reference_name,
Expand Down
2 changes: 1 addition & 1 deletion man/calc_kqs.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 29 additions & 0 deletions man/calculate_reference_point.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions man/convert_output.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/create_rda.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

66 changes: 33 additions & 33 deletions man/example_data.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/export_kqs.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/export_rda.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/extract_caps_alttext.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions man/extract_sis_data.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions man/figures/lifecycle-deprecated.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions man/figures/lifecycle-experimental.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions man/figures/lifecycle-stable.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions man/figures/lifecycle-superseded.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading