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
8 changes: 4 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,20 @@ Imports:
tidyselect,
utils
Suggests:
FIMS,
flextable,
here,
kableExtra,
knitr,
quarto,
r4ss,
rmarkdown,
testthat (>= 3.0.0),
FIMS
testthat (>= 3.0.0)
VignetteBuilder:
knitr
Remotes:
r4ss/r4ss,
NOAA-FIMS/FIMS
NOAA-FIMS/FIMS,
r4ss/r4ss
Config/roxygen2/version: 8.1.1
Config/testthat/edition: 3
Config/testthat/parallel: true
Expand Down
4 changes: 2 additions & 2 deletions R/conout_bam.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +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: 2 additions & 2 deletions R/conout_rceattle.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +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: 4 additions & 4 deletions R/conout_ss3.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +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 @@ -1263,7 +1263,7 @@ conout_ss3 <- function(
)
}
out_new <- Reduce(rbind, out_list)

# Composition data by bin from r4ss (lendbase, agedbase, condbase)
if (!is.character(file)) {
comp_rows <- ss3_composition_rows(
Expand All @@ -1278,7 +1278,7 @@ conout_ss3 <- function(
out_new <- rbind(out_new, comp_rows)
}
}

out_new |>
dplyr::mutate(
fleet = if (any(unique(out_new$fleet) %in% fleet_names)) fleet else fleet_names[fleet],
Expand Down
Loading
Loading