From 883f23afe5ae0d9d30bd06501f9c6c1e158bb08f Mon Sep 17 00:00:00 2001 From: hillarymarler Date: Tue, 17 Dec 2024 13:51:59 -0500 Subject: [PATCH 1/3] Update Utilities.R Now TADA_RandomTestingData will re-run until it returns at least 10 results --- R/Utilities.R | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/R/Utilities.R b/R/Utilities.R index 5e54198e9..8e447be61 100644 --- a/R/Utilities.R +++ b/R/Utilities.R @@ -915,7 +915,9 @@ TADA_GetUniqueNearbySites <- function(.data) { #' #' Retrieves data for a period of time in the past 20 years using #' TADA_DataRetrieval. This function can be used for testing functions on -#' random datasets. +#' random datasets. Only random data sets with 10 or more results will be returned. +#' If a random dataset has fewer than 10 results, the function will automatically +#' create another random WQP query until a df with greater than 10 results is returned. #' #' @param number_of_days Numeric. The default is 1, which will query and retrieve #' data for a random two-day period (e.g.startDate = "2015-04-21", @@ -944,19 +946,20 @@ TADA_GetUniqueNearbySites <- function(.data) { #' } #' TADA_RandomTestingData <- function(number_of_days = 1, choose_random_state = FALSE, autoclean = TRUE) { - while (TRUE) { + + get_random_data <- function(ndays = number_of_days, state_choice = choose_random_state, ac = autoclean) { # choose a random day within the last 20 years twenty_yrs_ago <- Sys.Date() - 20 * 365 random_start_date <- twenty_yrs_ago + sample(20 * 365, 1) # choose a random start date and add any number_of_days (set that as the end date) - end_date <- random_start_date + number_of_days + end_date <- random_start_date + ndays - if (choose_random_state == TRUE) { + if (state_choice == TRUE) { load(system.file("extdata", "statecodes_df.Rdata", package = "EPATADA")) state <- sample(statecodes_df$STUSAB, 1) } - if (choose_random_state == FALSE) { + if (state_choice == FALSE) { state <- "null" } @@ -966,7 +969,7 @@ TADA_RandomTestingData <- function(number_of_days = 1, choose_random_state = FAL statecode = state )) - if (autoclean == TRUE) { + if (ac == TRUE) { dat <- TADA_DataRetrieval( startDate = as.character(random_start_date), endDate = as.character(end_date), @@ -975,7 +978,7 @@ TADA_RandomTestingData <- function(number_of_days = 1, choose_random_state = FAL ) } - if (autoclean == FALSE) { + if (ac == FALSE) { dat <- TADA_DataRetrieval( startDate = as.character(random_start_date), endDate = as.character(end_date), @@ -983,11 +986,18 @@ TADA_RandomTestingData <- function(number_of_days = 1, choose_random_state = FAL applyautoclean = FALSE ) } - - if (nrow(dat) > 0) { - return(dat) + return(dat) + } + + verify_random_data <- function() { + df <- get_random_data() + while(nrow(df) < 10) { + df <- get_random_data() } + return(df) } + + verify_random_data() } #' Aggregate multiple result values to a min, max, or mean From 2494bbdf4297877cbca10f41f42e9c883ed9f732 Mon Sep 17 00:00:00 2001 From: hillarymarler Date: Tue, 17 Dec 2024 13:56:14 -0500 Subject: [PATCH 2/3] Update Utilities.R --- R/Utilities.R | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/R/Utilities.R b/R/Utilities.R index 8e447be61..7fed15832 100644 --- a/R/Utilities.R +++ b/R/Utilities.R @@ -945,9 +945,11 @@ TADA_GetUniqueNearbySites <- function(.data) { #' df <- TADA_RandomTestingData(number_of_days = 5, choose_random_state = TRUE, autoclean = FALSE) #' } #' -TADA_RandomTestingData <- function(number_of_days = 1, choose_random_state = FALSE, autoclean = TRUE) { +TADA_RandomTestingData <- function(number_of_days = 1, choose_random_state = FALSE, + autoclean = TRUE) { - get_random_data <- function(ndays = number_of_days, state_choice = choose_random_state, ac = autoclean) { + get_random_data <- function(ndays = number_of_days, state_choice = choose_random_state, + ac = autoclean) { # choose a random day within the last 20 years twenty_yrs_ago <- Sys.Date() - 20 * 365 random_start_date <- twenty_yrs_ago + sample(20 * 365, 1) From 788045467571956f23a6bc27d8eb71bf82121689 Mon Sep 17 00:00:00 2001 From: hillarymarler Date: Tue, 17 Dec 2024 13:56:47 -0500 Subject: [PATCH 3/3] Update TADA_RandomTestingData.Rd --- man/TADA_RandomTestingData.Rd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/man/TADA_RandomTestingData.Rd b/man/TADA_RandomTestingData.Rd index 7a20560e9..7634dc26e 100644 --- a/man/TADA_RandomTestingData.Rd +++ b/man/TADA_RandomTestingData.Rd @@ -32,7 +32,9 @@ Random WQP dataset. \description{ Retrieves data for a period of time in the past 20 years using TADA_DataRetrieval. This function can be used for testing functions on -random datasets. +random datasets. Only random data sets with 10 or more results will be returned. +If a random dataset has fewer than 10 results, the function will automatically +create another random WQP query until a df with greater than 10 results is returned. } \examples{ \dontrun{