Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
70a30f1
feat: convert multiple models into standard stockplotr format
JZahner1 Nov 4, 2026
6821495
fix: :bug: make sure input is a list of models
JZahner1 Nov 4, 2026
0a45764
fix: make sure columns are same type across model platforms
JZahner1 Nov 4, 2026
ae061be
tests: update expected dimensions not that "model" column is always a…
JZahner1 Nov 4, 2026
9ede8eb
tests: add test for convert_output on multiple models.
JZahner1 Nov 4, 2026
b3f7f96
refactor: removed list processing from filter_data
JZahner1 Nov 5, 2026
fa2277e
test: add tests for multimodel data processing
JZahner1 Nov 5, 2026
af39895
refactor: remove dplyr deprecation warnings from conout_ss3
JZahner1 Nov 5, 2026
27178cc
test: add test for plot_abundance_at_age with multiple models
JZahner1 Nov 6, 2026
7d89219
refactor: change reference_line helper functions to work with multipl…
JZahner1 Nov 6, 2026
fd4e0cb
tests: add tests for multiple reference lines
JZahner1 Nov 6, 2026
636e749
tests: use custom directories for wiring RDA files for export-rda tests
JZahner1 Nov 6, 2026
51e33be
Merge branch 'nmfs-ost:main' into feat-multi-model-processing
JZahner1 Nov 6, 2026
e1d6d0d
feat: Add handling for specifying "models" and "fleet_names" paramete…
JZahner1 Nov 9, 2026
719a111
docs: Update roxygen to reflect changes to parameters for multiple mo…
JZahner1 Nov 9, 2026
c0f24d3
docs: Update roxygen to reflect changes to parameters for multiple mo…
JZahner1 Nov 9, 2026
75f5e25
Merge branch 'feat-multi-model-processing' of https://github.com/JZah…
JZahner1 Nov 9, 2026
c3cfea6
fix: Swicth erroneous %>% to |> format
JZahner1 Nov 9, 2026
5ae9ee5
Merge remote-tracking branch 'upstream/main' into feat-multi-model-pr…
JZahner1 Nov 12, 2026
8c9ba5e
Merge remote-tracking branch 'upstream/main' into feat-multi-model-pr…
JZahner1 Nov 13, 2026
31d3971
mend
JZahner1 Nov 13, 2026
69701ab
docs: minor roxygen updates
JZahner1 Nov 16, 2026
182dfd3
fix: make sure that models vector is being used where appropriate
JZahner1 Nov 16, 2026
6b878ac
refactor: improved CLI messaging
JZahner1 Nov 16, 2026
f49338b
Merge remote-tracking branch 'upstream/main' into feat-multi-model-pr…
JZahner1 Nov 16, 2026
dccf12e
revert: add back in checks for NULL fleet_names
JZahner1 Nov 16, 2026
085dc1c
refactor: add `model` column to `example_data`
JZahner1 Nov 16, 2026
511c093
build: add FIMS dependency
JZahner1 Nov 16, 2026
dd32262
Fix formatting in DESCRIPTION file
JZahner1 Nov 16, 2026
7f9006b
Merge remote-tracking branch 'upstream/main' into feat-multi-model-pr…
JZahner1 Nov 16, 2026
91a94cc
refactor: remove erroneous test case for plot_runs_test
JZahner1 Nov 16, 2026
5ece022
Merge branch 'feat-multi-model-processing' of https://github.com/JZah…
JZahner1 Nov 16, 2026
d1ff366
chore: update SS3 r4ss example_data from converter resource changes (…
github-actions[bot] Nov 17, 2026
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
6 changes: 4 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,13 @@ Suggests:
quarto,
r4ss,
rmarkdown,
testthat (>= 3.0.0)
testthat (>= 3.0.0),
FIMS
VignetteBuilder:
knitr
Remotes:
r4ss/r4ss
r4ss/r4ss,
NOAA-FIMS/FIMS
Config/roxygen2/version: 8.1.1
Config/testthat/edition: 3
Config/testthat/parallel: true
Expand Down
4 changes: 4 additions & 0 deletions R/conout_bam.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
#' Does not change naming conventions.
#'
#' @inheritParams convert_output
#'
#' @param file. Assessment model output file path. Currently accepts SS3
#' Report.sso file, BAM .rda file, Rceattle model object, and FIMS model object.
#'
#' @param out_new The empty standard output data frame from
#' [convert_output()], which sets the columns of the output.
#'
Expand Down
4 changes: 4 additions & 0 deletions R/conout_rceattle.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
#' Does not change naming conventions.
#'
#' @inheritParams convert_output
#'
#' @param file. Assessment model output file path. Currently accepts SS3
#' Report.sso file, BAM .rda file, Rceattle model object, and FIMS model object.
#'
#' @param out_new The empty standard output data frame from
#' [convert_output()], which sets the columns of the output.
#'
Expand Down
8 changes: 6 additions & 2 deletions R/conout_ss3.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
#' file or returned object from `r4ss::ss_output()`.
#'
#' @inheritParams convert_output
#'
#' @param file. Assessment model output file path. Currently accepts SS3
#' Report.sso file, BAM .rda file, Rceattle model object, and FIMS model object.
#'
#' @param out_new The empty standard output data frame from
#' [convert_output()], which sets the columns of the output.
#'
Expand Down Expand Up @@ -281,7 +285,7 @@ conout_ss3 <- function(
for (i in intersect(tolower(fleet_names), colnames(df3))) {
col_name <- glue::glue("exploitation_{i}")
df3 <- df3 |>
dplyr::rename(!!col_name := i)
dplyr::rename(!!col_name := dplyr::all_of(i))
}
}
}
Expand Down Expand Up @@ -328,7 +332,7 @@ conout_ss3 <- function(
if (length(err_col_id) > 0) {
uncert_name <- stringr::str_extract(err_col_id, paste0(errors, collapse = "|"))
df3 <- df3 |>
dplyr::rename(!!uncert_name := err_col_id)
dplyr::rename(!!uncert_name := dplyr::all_of(err_col_id))
}
df4 <- df3 |>
tidyr::pivot_longer(
Expand Down
Loading