Added file versions to modified path strings

Author: GeoffMayhew-NOAA

analyses/monitoring_costs/monitoring_costs.R

@@ -44,18 +44,18 @@ ADP_dribble <- gdrive_set_dribble("Projects/ADP/source_data")
 #' Load the outputs of `get_data.R`
 adp_data.path <- paste0("source_data/", adp_year, "_", adp_ver, "_ADP_data.rdata")
 gdrive_download(local_path = adp_data.path, gdrive_dribble = ADP_dribble, ver = 8)
-adp_data.objects <- (load(adp_data.path))
+adp_data.objects <- (load(sub(".rdata", "_v008.rdata", adp_data.path)))
 # Keep only what is needed
 rm("adp_data.path", "adp_data.objects", list = setdiff(c(adp_data.objects), c("work.data.recent", "max_date", "trw_em")))
 
 #'Load billable days for actual plant days, created in `get_data.R`
 gdrive_download("source_data/ais_billable_days.Rdata", ADP_dribble, ver = 8)
-(load("source_data/ais_billable_days.Rdata"))
+(load("source_data/ais_billable_days_v008.Rdata"))
 
 #' Load the outputs of `trip_duration.R`
 trip_data.path <- paste0("source_data/trip_duration_", adp_year, "_", adp_ver, ".rdata")
 gdrive_download(local_path = trip_data.path, gdrive_dribble = ADP_dribble, ver = 3)
-(load(trip_data.path))
+(load(sub(".rdata", "_v003.rdata", trip_data.path)))
 
 #====================#
 ### FMA Days Paid ----
@@ -76,7 +76,7 @@ FMA_days_paid <- lapply(read_xl_allsheets("analyses/monitoring_costs/FMA Days Pa
 #' The 'current' year is the year before `adp_year`, i.e., the year we are currently in as we plan for the next year.
 prior_adp_results.path <- paste0("results/", adp_year - 1, "_Final_ADP_results.rdata")
 gdrive_download(local_path = prior_adp_results.path , gdrive_set_dribble("Projects/ADP/Output/"), ver = 6)
-current_adp_items <- (load(prior_adp_results.path))
+current_adp_items <- (load(sub(".rdata", "_v006.rdata", prior_adp_results.path)))
 # Remove everything added aside from the ADP rates
 rm("prior_adp_results.path", list = setdiff(current_adp_items, c("rates_adp")))
 

analyses/trip_duration/trip_duration.R

@@ -20,7 +20,7 @@ gdrive_download(
   gdrive_dribble = gdrive_set_dribble("Projects/ADP/source_data/"),
   ver = 8
 )
-adp_data.objects <- (load(adp_data.path))
+adp_data.objects <- (load(sub(".rdata", "_v008.rdata", adp_data.path)))
 
 # Cleanup all but the absolutely necessary inputs
 rm(adp_data.objects, list = setdiff(adp_data.objects,

selection_rates.R

@@ -37,7 +37,7 @@ gdrive_download(
   gdrive_dribble = gdrive_set_dribble("Projects/ADP/source_data/"),
   ver = 8
 )
-(load(adp_data.path))
+(load(sub(".rdata", "_v008.rdata", adp_data.path)))
 
 #' Load the outputs of `trip_duration.R`
 trip_data.path <- paste0("source_data/trip_duration_", adp_year, "_", adp_ver, ".rdata")
@@ -46,7 +46,7 @@ gdrive_download(
   gdrive_dribble = gdrive_set_dribble("Projects/ADP/source_data/"),
   ver = 3
 )
-(load(trip_data.path))
+(load(sub(".rdata", "_v003.rdata", trip_data.path)))
 
 #' Load `cost_params`, the output of `analyses/monitoring_costs.R`.
 cost_param.path <- paste0("source_data/cost_params_", adp_year, ".Rdata")
@@ -56,7 +56,7 @@ if(file.exists(cost_param.path)) {
     gdrive_dribble = gdrive_set_dribble("Projects/ADP/Monitoring Costs - CONFIDENTIAL/"),
     ver = 7
   )
-  (load(cost_param.path))
+  (load(sub(".rdata", "_v007.rdata", cost_param.path)))
 
   #' Using `fg_em` from `get_data.R`, add the number of fixed-gear EM vessels to the `cost_params` list
   cost_params$EMFG$emfg_v <- uniqueN(fg_em[FLAG %in% c("A", "NONE"), PERMIT])
@@ -72,7 +72,7 @@ if(adp_ver == "Final") {
     gdrive_dribble = gdrive_set_dribble("Projects/ADP/source_data/"),
     ver = 4
   )
-  (load(effort_prediction.path))
+  (load(sub(".rdata", "_v004.rdata", effort_prediction.path)))
 }
 
 # Load the ADFG statistical area shapefile.
@@ -513,7 +513,7 @@ if(adp_ver == "Draft") {
     gdrive_dribble = gdrive_set_dribble("Projects/ADP/Output"),
     ver = 5 # 2026 Draft ADP
   )
-  (load(draft_tables_name))
+  (load(sub(".rdata", "_v005.rdata", draft_tables_name)))
   table_b1.draft <- copy(table_b1)
   table_b2.draft <- copy(table_b2)
   table_b3.draft <- copy(table_b3)