Merge branch 'main' into km-fix-utils

Author: dajmcdon

R/archive.R

@@ -217,11 +217,9 @@ epi_archive =
 
             # Filter by version and return
             return(
-              # Make sure to use data.table ways of filtering and selecting 
-              self$DT[between(time_value,
-                              min_time_value,
-                              max_version) &
-                      version <= max_version, ] %>%
+              # Make sure to use data.table ways of filtering and selecting
+              self$DT[time_value >= min_time_value &
+                        version <= max_version, ] %>%
               unique(by = c("geo_value", "time_value", other_keys),
                      fromLast = TRUE) %>%
               tibble::as_tibble() %>% 

R/slide.R

@@ -113,13 +113,17 @@
 #'   jhu_csse_daily_subset %>%
 #'   group_by(geo_value) %>%
 #'   epi_slide(cases_7dav = mean(cases), n = 7, 
-#'             align = "right")
+#'             align = "right") %>% 
+#'   # rmv a nonessential var. to ensure new col is printed
+#'   dplyr::select(-death_rate_7d_av) 
 #'  
 #'  # slide a left-aligned 7-day average
 #'   jhu_csse_daily_subset %>%
 #'   group_by(geo_value) %>%
 #'   epi_slide(cases_7dav = mean(cases), n = 7, 
-#'             align = "left")
+#'             align = "left") %>% 
+#'   # rmv a nonessential var. to ensure new col is printed
+#'   dplyr::select(-death_rate_7d_av) 
 #'  
 #'  # nested new columns
 #'  jhu_csse_daily_subset %>%