From 9788c7370353ac7a8980a185f32d792842e9dcdf Mon Sep 17 00:00:00 2001 From: Kathryn Doering Date: Tue, 30 Jul 2024 18:10:30 +0000 Subject: [PATCH] partial work: new r4ss names --- DESCRIPTION | 2 +- R/sample_struct.R | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 6bdc6997..1f6c552f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -27,7 +27,7 @@ Imports: ggplot2, magrittr, parallel, - r4ss, + r4ss (>= 1.50.0), ss3sim, stats, tidyr, diff --git a/R/sample_struct.R b/R/sample_struct.R index 35b3ffcc..2086b52c 100644 --- a/R/sample_struct.R +++ b/R/sample_struct.R @@ -12,17 +12,17 @@ convert_to_r4ss_names <- function(sample_struct, rep("MeanSize_at_Age_obs", 7) ), r4ss_name = c( - "year", "seas", "fleet", "catch_se", - "year", "seas", "index", "se_log", - "Yr", "Seas", "FltSvy", "Gender", "Part", "Nsamp", - "Yr", "Seas", "FltSvy", "Gender", "Part", "Ageerr", "Lbin_lo", - "Lbin_hi", "Nsamp", + "year", "seas", "fleet", "catch_se", # catch + "year", "month", "index", "se_log", # cpue + "year", "month", "fleet", "sex", "part", "Nsamp", #lencomp + "year", "month", "fleet", "sex", "part", "ageerr", "Lbin_lo", + "Lbin_hi", "Nsamp", #agecomp # mean size - "Year", "Seas", "Fleet", "Partition", "Type", "Std_in", + "year", "month", "fleet", "part", "type", "stderr", # generalized size comp # meansize at age - note sample sizes are for each bin and sex, but # currently SSMSE only allows repeating the same sample sizes. - "Yr", "Seas", "FltSvy", "Gender", "Part", "AgeErr", "N_" + "year", "month", "fleet", "sex", "part", "ageerr", "N_" # Tags releases # "Area", "Yr", "Season", "Gender", "Age", "Nrelease", # Morph comp