diff --git a/.github/workflows/update-example-data.yml b/.github/workflows/update-example-data.yml index 09e39c1a..6dca7f56 100644 --- a/.github/workflows/update-example-data.yml +++ b/.github/workflows/update-example-data.yml @@ -27,7 +27,7 @@ jobs: - uses: r-lib/actions/setup-r-dependencies@v2 with: - extra-packages: any::devtools, any::usethis, local::. + extra-packages: any::pak, any::usethis, local::. - name: Update example data run: Rscript data-raw/DATASET.R diff --git a/data-raw/DATASET.R b/data-raw/DATASET.R index b8ccbede..90a837fb 100644 --- a/data-raw/DATASET.R +++ b/data-raw/DATASET.R @@ -2,7 +2,7 @@ # Path to SS3 output file EX_REPORT_PATH <- file.path("inst", "extdata", "Report.sso") # Install stockplotr -devtools::install_local(".") +pak::local_install(".") # Convert output example_data <- stockplotr::convert_output(EX_REPORT_PATH) # Save object as rda into raw_data diff --git a/data/example_data.rda b/data/example_data.rda index e2ce34f2..dc2e5ff6 100644 Binary files a/data/example_data.rda and b/data/example_data.rda differ diff --git a/inst/resources/bam_var_names.csv b/inst/resources/bam_var_names.csv index 1a83af6d..1aa7f328 100644 --- a/inst/resources/bam_var_names.csv +++ b/inst/resources/bam_var_names.csv @@ -194,7 +194,7 @@ t.series,F,fishing_mortality t.series,F.D,fishing_mortality_discards t.series,Fsum,total_fishing_mortality t.series,N,abundance -t.series,recruits,recruitment +t.series,recruits,recruitment_testing_name t.series,logR.dev,log_recruitment_deviations t.series,SSB.SSBmsy,sb_sb_msy t.series,SSB.msst,sb_msst @@ -304,7 +304,7 @@ parms,l.f30.knum,landings_f30_numbers parms,l.f30.mt,landings_f30_weight parms,msy.mt,msy_weight parms,ssb.f30,spawning_biomass_f30 -projection,b.proj,biomass +projection,b.proj,biomass_testing_name projection,f.proj,fishing_mortality projection,l.knum.proj,landings_numbers projection,l.my.proj,landings_weight diff --git a/inst/resources/ss3_var_names.csv b/inst/resources/ss3_var_names.csv index 158a7fd0..148d7518 100644 --- a/inst/resources/ss3_var_names.csv +++ b/inst/resources/ss3_var_names.csv @@ -1,7 +1,7 @@ module_name,label,alt_label DERIVED_QUANTITIES,SSB_Virgin,spawning_biomass_unfished DERIVED_QUANTITIES,SSB_Initial,spawning_biomass_initial -DERIVED_QUANTITIES,SSB,spawning_biomass +DERIVED_QUANTITIES,SSB,spawning_biomass_testing_name DERIVED_QUANTITIES,Recr_Virgin,spawning_biomass DERIVED_QUANTITIES,Recr_Initial,recruitment_initial DERIVED_QUANTITIES,Recr,recruitment