Updates to mod3 functions and vignettes #713
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Handle errors in TADA_ExampleMod3Workflow vignette
Comment on lines
924
to
925
| TADA_CreateParamRef <- function(.data, org_id = NULL, paramRef = NULL, auto_assign = c("None", "All", "Org"), | ||
| excel = FALSE, overwrite = FALSE) { |
Contributor
There was a problem hiding this comment.
[air] reported by reviewdog 🐶
Suggested change
| TADA_CreateParamRef <- function(.data, org_id = NULL, paramRef = NULL, auto_assign = c("None", "All", "Org"), | |
| excel = FALSE, overwrite = FALSE) { | |
| TADA_CreateParamRef <- function( | |
| .data, | |
| org_id = NULL, | |
| paramRef = NULL, | |
| auto_assign = c("None", "All", "Org"), | |
| excel = FALSE, | |
| overwrite = FALSE | |
| ) { |
| CreateParamRef <- TADA_param %>% | ||
| dplyr::mutate(ATTAINS.ParameterName = as.character(NA)) %>% | ||
| dplyr::select( | ||
| TADA.CharacteristicName, TADA.ComparableDataIdentifier, ATTAINS.OrganizationIdentifier, |
Contributor
There was a problem hiding this comment.
[air] reported by reviewdog 🐶
Suggested change
| TADA.CharacteristicName, TADA.ComparableDataIdentifier, ATTAINS.OrganizationIdentifier, | |
| TADA.CharacteristicName, | |
| TADA.ComparableDataIdentifier, | |
| ATTAINS.OrganizationIdentifier, |
| ) %>% | ||
| dplyr::mutate(ATTAINS.ParameterName = ATTAINS.ParameterName.y) %>% | ||
| dplyr::select( | ||
| TADA.ComparableDataIdentifier, ATTAINS.OrganizationIdentifier, |
Contributor
There was a problem hiding this comment.
[air] reported by reviewdog 🐶
Suggested change
| TADA.ComparableDataIdentifier, ATTAINS.OrganizationIdentifier, | |
| TADA.ComparableDataIdentifier, | |
| ATTAINS.OrganizationIdentifier, |
| dplyr::bind_rows(paramRef[,c("ATTAINS.OrganizationIdentifier", "TADA.ComparableDataIdentifier", "ATTAINS.ParameterName", "Flag.ParameterInput")]) %>% | ||
| dplyr::mutate( | ||
| ATTAINS.FlagParameterName = dplyr::case_when( | ||
| ATTAINS.ParameterName == "Not Applicable for Analysis." | is.na(ATTAINS.ParameterName) ~ |
Contributor
There was a problem hiding this comment.
[air] reported by reviewdog 🐶
Suggested change
| ATTAINS.ParameterName == "Not Applicable for Analysis." | is.na(ATTAINS.ParameterName) ~ | |
| ATTAINS.ParameterName == "Not Applicable for Analysis." | | |
| is.na(ATTAINS.ParameterName) ~ |
Comment on lines
1857
to
+1858
| dplyr::select(ATTAINS.OrganizationIdentifier, ATTAINS.ParameterName, ATTAINS.UseName, IncludeOrExclude) %>% | ||
| dplyr::left_join(paramRef, by = c("ATTAINS.OrganizationIdentifier", "ATTAINS.ParameterName", "IncludeOrExclude")) | ||
| dplyr::left_join(paramRef, by = c("ATTAINS.OrganizationIdentifier", "ATTAINS.ParameterName")) |
Contributor
There was a problem hiding this comment.
[air] reported by reviewdog 🐶
Suggested change
| dplyr::select(ATTAINS.OrganizationIdentifier, ATTAINS.ParameterName, ATTAINS.UseName, IncludeOrExclude) %>% | |
| dplyr::left_join(paramRef, by = c("ATTAINS.OrganizationIdentifier", "ATTAINS.ParameterName", "IncludeOrExclude")) | |
| dplyr::left_join(paramRef, by = c("ATTAINS.OrganizationIdentifier", "ATTAINS.ParameterName")) | |
| dplyr::select( | |
| ATTAINS.OrganizationIdentifier, | |
| ATTAINS.ParameterName, | |
| ATTAINS.UseName, | |
| IncludeOrExclude | |
| ) %>% | |
| dplyr::left_join( | |
| paramRef, | |
| by = c("ATTAINS.OrganizationIdentifier", "ATTAINS.ParameterName") | |
| ) |
| dplyr::left_join(paramRef, by = c("ATTAINS.OrganizationIdentifier", "ATTAINS.ParameterName", "IncludeOrExclude")) | ||
| dplyr::left_join(paramRef, by = c("ATTAINS.OrganizationIdentifier", "ATTAINS.ParameterName")) | ||
| } else { | ||
| print("IncludeOrExclude was not found as a column name in your user supplied, assuming all parameter and uses are applicable for your analysis.") |
Contributor
There was a problem hiding this comment.
[air] reported by reviewdog 🐶
Suggested change
| print("IncludeOrExclude was not found as a column name in your user supplied, assuming all parameter and uses are applicable for your analysis.") | |
| print( | |
| "IncludeOrExclude was not found as a column name in your user supplied, assuming all parameter and uses are applicable for your analysis." | |
| ) |
|
|
||
| # If user supplies criteria methods table, then auto_assign = T for any non-matched values | ||
| if (!is.null(criteriaMethods)) { | ||
| print("A criteriaMethods table was provided. auto_assign will be set to 'TRUE' to determine any missing or non-matching inputs.") |
Contributor
There was a problem hiding this comment.
[air] reported by reviewdog 🐶
Suggested change
| print("A criteriaMethods table was provided. auto_assign will be set to 'TRUE' to determine any missing or non-matching inputs.") | |
| print( | |
| "A criteriaMethods table was provided. auto_assign will be set to 'TRUE' to determine any missing or non-matching inputs." | |
| ) |
| # Invalid function input combos - MLSummaryRef and auto_assign = TRUE cannot be used together | ||
| if (!is.null(MLSummaryRef) && auto_assign == TRUE) { | ||
| stop("TADA_DefineCriteriaMethodology: MLSummaryRef is provided and autofill = TRUE are not valid function argument input combinations.") | ||
| stop("TADA_DefineCriteriaMethodology: MLSummaryRef is provided and auto_assign = TRUE are not valid function argument input combinations.") |
Contributor
There was a problem hiding this comment.
[air] reported by reviewdog 🐶
Suggested change
| stop("TADA_DefineCriteriaMethodology: MLSummaryRef is provided and auto_assign = TRUE are not valid function argument input combinations.") | |
| stop( | |
| "TADA_DefineCriteriaMethodology: MLSummaryRef is provided and auto_assign = TRUE are not valid function argument input combinations." | |
| ) |
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
run styler, keep dataframe type, and explicit dplyr package call fix.
Comment on lines
+1187
to
+1188
| dplyr::select(ATTAINS.OrganizationIdentifier, TADA.ComparableDataIdentifier, ATTAINS.ParameterName) %>% | ||
| dplyr::mutate(Flag.ParameterInput = "This crosswalk was provided through a user supplied table") %>% |
Contributor
There was a problem hiding this comment.
[air] reported by reviewdog 🐶
Suggested change
| dplyr::select(ATTAINS.OrganizationIdentifier, TADA.ComparableDataIdentifier, ATTAINS.ParameterName) %>% | |
| dplyr::mutate(Flag.ParameterInput = "This crosswalk was provided through a user supplied table") %>% | |
| dplyr::select( | |
| ATTAINS.OrganizationIdentifier, | |
| TADA.ComparableDataIdentifier, | |
| ATTAINS.ParameterName | |
| ) %>% | |
| dplyr::mutate( | |
| Flag.ParameterInput = "This crosswalk was provided through a user supplied table" | |
| ) %>% |
Comment on lines
+1192
to
+1194
| dplyr::select(ATTAINS.OrganizationIdentifier, TADA.ComparableDataIdentifier, ATTAINS.ParameterName, Flag.ParameterInput) %>% | ||
| dplyr::filter(!TADA.ComparableDataIdentifier %in% paramRef$TADA.ComparableDataIdentifier) %>% | ||
| dplyr::bind_rows(paramRef[, c("ATTAINS.OrganizationIdentifier", "TADA.ComparableDataIdentifier", "ATTAINS.ParameterName", "Flag.ParameterInput")]) %>% |
Contributor
There was a problem hiding this comment.
[air] reported by reviewdog 🐶
Suggested change
| dplyr::select(ATTAINS.OrganizationIdentifier, TADA.ComparableDataIdentifier, ATTAINS.ParameterName, Flag.ParameterInput) %>% | |
| dplyr::filter(!TADA.ComparableDataIdentifier %in% paramRef$TADA.ComparableDataIdentifier) %>% | |
| dplyr::bind_rows(paramRef[, c("ATTAINS.OrganizationIdentifier", "TADA.ComparableDataIdentifier", "ATTAINS.ParameterName", "Flag.ParameterInput")]) %>% | |
| dplyr::select( | |
| ATTAINS.OrganizationIdentifier, | |
| TADA.ComparableDataIdentifier, | |
| ATTAINS.ParameterName, | |
| Flag.ParameterInput | |
| ) %>% | |
| dplyr::filter( | |
| !TADA.ComparableDataIdentifier %in% | |
| paramRef$TADA.ComparableDataIdentifier | |
| ) %>% | |
| dplyr::bind_rows(paramRef[, c( | |
| "ATTAINS.OrganizationIdentifier", | |
| "TADA.ComparableDataIdentifier", | |
| "ATTAINS.ParameterName", | |
| "Flag.ParameterInput" | |
| )]) %>% |
Comment on lines
1208
to
1209
| TADA.ComparableDataIdentifier, ATTAINS.OrganizationIdentifier, ATTAINS.ParameterName, | ||
| ATTAINS.FlagParameterName, Flag.ParameterInput |
Contributor
There was a problem hiding this comment.
[air] reported by reviewdog 🐶
Suggested change
| TADA.ComparableDataIdentifier, ATTAINS.OrganizationIdentifier, ATTAINS.ParameterName, | |
| ATTAINS.FlagParameterName, Flag.ParameterInput | |
| TADA.ComparableDataIdentifier, | |
| ATTAINS.OrganizationIdentifier, | |
| ATTAINS.ParameterName, | |
| ATTAINS.FlagParameterName, | |
| Flag.ParameterInput |
|
|
||
| # remove intermediate object Flag1 | ||
| rm(Flag1, Flag2) | ||
|
|
| #' @return Updated sysdata.rda with updated ATTAINSParamToWQPCharRef object | ||
| #' | ||
| #' @export | ||
| TADA_GetATTAINSParamToWQPCharRef <- function(charAliasType = c("All", "ATTAINS")) { |
Contributor
There was a problem hiding this comment.
[air] reported by reviewdog 🐶
Suggested change
| TADA_GetATTAINSParamToWQPCharRef <- function(charAliasType = c("All", "ATTAINS")) { | |
| TADA_GetATTAINSParamToWQPCharRef <- function( | |
| charAliasType = c("All", "ATTAINS") | |
| ) { |
Comment on lines
+491
to
493
| AssessPeriod = as.character(NA), AssessPeriodStartDate = as.Date(NA), AssessPeriodEndDate = as.Date(NA), | ||
| Season = as.character(NA), SeasonStartDate = as.Date(NA), SeasonEndDate = as.Date(NA), | ||
| DistrCount = as.numeric(NA), DistrPeriod = as.character(NA), DistrMinSample = as.numeric(NA), Notes = as.character(NA) |
Contributor
There was a problem hiding this comment.
[air] reported by reviewdog 🐶
Suggested change
| AssessPeriod = as.character(NA), AssessPeriodStartDate = as.Date(NA), AssessPeriodEndDate = as.Date(NA), | |
| Season = as.character(NA), SeasonStartDate = as.Date(NA), SeasonEndDate = as.Date(NA), | |
| DistrCount = as.numeric(NA), DistrPeriod = as.character(NA), DistrMinSample = as.numeric(NA), Notes = as.character(NA) | |
| AssessPeriod = as.character(NA), | |
| AssessPeriodStartDate = as.Date(NA), | |
| AssessPeriodEndDate = as.Date(NA), | |
| Season = as.character(NA), | |
| SeasonStartDate = as.Date(NA), | |
| SeasonEndDate = as.Date(NA), | |
| DistrCount = as.numeric(NA), | |
| DistrPeriod = as.character(NA), | |
| DistrMinSample = as.numeric(NA), | |
| Notes = as.character(NA) |
Comment on lines
65
to
67
| use_name = USE_CLASS_NAME_LOCATION_ETC, CRITERION_VALUE, | ||
| CRITERIATYPEAQUAHUMHLTH, CRITERIATYPEFRESHSALTWATER, | ||
| CRITERIATYPE_ACUTECHRONIC, CRITERIATYPE_WATERORG, UNIT_NAME |
Contributor
There was a problem hiding this comment.
[air] reported by reviewdog 🐶
Suggested change
| use_name = USE_CLASS_NAME_LOCATION_ETC, CRITERION_VALUE, | |
| CRITERIATYPEAQUAHUMHLTH, CRITERIATYPEFRESHSALTWATER, | |
| CRITERIATYPE_ACUTECHRONIC, CRITERIATYPE_WATERORG, UNIT_NAME | |
| use_name = USE_CLASS_NAME_LOCATION_ETC, | |
| CRITERION_VALUE, | |
| CRITERIATYPEAQUAHUMHLTH, | |
| CRITERIATYPEFRESHSALTWATER, | |
| CRITERIATYPE_ACUTECHRONIC, | |
| CRITERIATYPE_WATERORG, | |
| UNIT_NAME |
| #' @export | ||
| TADA_GetCriteriaSearchToolRef <- function(){ | ||
| TADA_GetCriteriaSearchToolRef <- function() { | ||
| CST.raw <- openxlsx::read.xlsx("https://cfpub.epa.gov/wqsits/wqcsearch/criteria-search-tool-data.xlsx") |
Contributor
There was a problem hiding this comment.
[air] reported by reviewdog 🐶
Suggested change
| CST.raw <- openxlsx::read.xlsx("https://cfpub.epa.gov/wqsits/wqcsearch/criteria-search-tool-data.xlsx") | |
| CST.raw <- openxlsx::read.xlsx( | |
| "https://cfpub.epa.gov/wqsits/wqcsearch/criteria-search-tool-data.xlsx" | |
| ) |
| # extract unique ATTAINS parameter names | ||
| ref <- ATTAINS.raw[, "name"] | ||
| old <- utils::read.csv(system.file("extdata", "ATTAINSParamToWQPCharRef.csv", package = "EPATADA"))[,"ATTAINS.ParameterName"] | ||
| old <- utils::read.csv(system.file("extdata", "ATTAINSParamToWQPCharRef.csv", package = "EPATADA"))[, "ATTAINS.ParameterName"] |
Contributor
There was a problem hiding this comment.
[air] reported by reviewdog 🐶
Suggested change
| old <- utils::read.csv(system.file("extdata", "ATTAINSParamToWQPCharRef.csv", package = "EPATADA"))[, "ATTAINS.ParameterName"] | |
| old <- utils::read.csv(system.file( | |
| "extdata", | |
| "ATTAINSParamToWQPCharRef.csv", | |
| package = "EPATADA" | |
| ))[, "ATTAINS.ParameterName"] |
| dplyr::distinct() | ||
| ref <- CST$POLLUTANT_NAME | ||
| old <- utils::read.csv(system.file("extdata", "CriteriaSearchToolRef.csv", package = "EPATADA"))[,"POLLUTANT_NAME"] | ||
| old <- utils::read.csv(system.file("extdata", "CriteriaSearchToolRef.csv", package = "EPATADA"))[, "POLLUTANT_NAME"] |
Contributor
There was a problem hiding this comment.
[air] reported by reviewdog 🐶
Suggested change
| old <- utils::read.csv(system.file("extdata", "CriteriaSearchToolRef.csv", package = "EPATADA"))[, "POLLUTANT_NAME"] | |
| old <- utils::read.csv(system.file( | |
| "extdata", | |
| "CriteriaSearchToolRef.csv", | |
| package = "EPATADA" | |
| ))[, "POLLUTANT_NAME"] |
Contributor
system.file to read in example criteria table
updated criteria_table.rda read in
display data table for each chunk
cristinamullin
approved these changes
Nov 25, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
some minor updates to handle errors in the mod 3 vignette.
MT.ParamRef.All <- TADA_CreateParamRef( tada.MT.clean, org_id = c("MTDEQ", "MDE_EASP", "21ARIZ"), auto_assign = "Org", excel = FALSE )MT.Criteria.auto3 <- TADA_DefineCriteriaMethodology( tada.MT.clean, org_id = c("MTDEQ","MDE_EASP", "21ARIZ"), # add other org_id to see output auto_assign = TRUE, epa304a = TRUE, displayUniqueId = TRUE, excel = FALSE )