Refactor .rename_columns

R/globals.R

@@ -1,20 +1,10 @@
 # Generated by roxyglobals: do not edit by hand
 
 utils::globalVariables(c(
-  ".data", # <epidist_diagnostics>
   "samples", # <epidist_diagnostics>
-  ".data", # <as_direct_model.data.frame>
-  ".data", # <as_latent_individual.epidist_linelist>
   "woverlap", # <epidist_stancode.epidist_latent_individual>
-  ".data", # <observe_process>
-  ".data", # <filter_obs_by_obs_time>
-  ".data", # <filter_obs_by_ptime>
   ":=", # <filter_obs_by_ptime>
-  ".data", # <add_mean_sd.lognormal_samples>
-  ".data", # <add_mean_sd.gamma_samples>
   "rlnorm", # <simulate_secondary>
-  ".data", # <simulate_secondary>
-  ".data", # <.replace_prior>
   "prior_new", # <.replace_prior>
   "source_new", # <.replace_prior>
   NULL

R/preprocess.R

@@ -14,11 +14,12 @@ as_epidist_linelist <- function(
 ) {
   class(data) <- c("epidist_linelist", class(data))
 
-  data <- .rename_column(data, "pdate_lwr", pdate_lwr)
-  data <- .rename_column(data, "pdate_upr", pdate_upr)
-  data <- .rename_column(data, "sdate_lwr", sdate_lwr)
-  data <- .rename_column(data, "sdate_upr", sdate_upr)
-  data <- .rename_column(data, "obs_date", obs_date)
+  data <- .rename_columns(data,
+    new_names = c(
+      "pdate_lwr", "pdate_upr", "sdate_lwr", "sdate_upr", "obs_date"
+    ),
+    old_names = c(pdate_lwr, pdate_upr, sdate_lwr, sdate_upr, obs_date)
+  )
 
   # Check for being a datetime
   assert_true(any(inherits(data$pdate_lwr, c("POSIXct", "POSIXlt"))))

R/utils.R

@@ -125,10 +125,19 @@
   return(formula)
 }
 
-.rename_column <- function(df, new, old) {
-  are_char <- is.character(new) & is.character(old)
-  if (are_char) {
-    df <- dplyr::rename(df, !!new := !!old)
+#' Rename the columns of a `data.frame`
+#'
+#' @param df ...
+#' @param new_names ...
+#' @param old_names ...
+#' @keywords internal
+.rename_columns <- function(df, new_names, old_names) {
+  are_char <- is.character(new_names) & is.character(old_names)
+  valid_new_names <- new_names[are_char]
+  valid_old_names <- old_names[are_char]
+  if (length(are_char) > 0) {
+    rename_map <- setNames(valid_old_names, valid_new_names)
+    df <- dplyr::rename(df, !!!rename_map)
   }
   return(df)
 }