diff --git a/DESCRIPTION b/DESCRIPTION index 6d3768eed9..5a56820de2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: admiral Title: ADaM in R Asset Library -Version: 1.1.0.9001 +Version: 1.1.1 Authors@R: c( person("Ben", "Straub", , "ben.x.straub@gsk.com", role = c("aut", "cre")), person("Stefan", "Bundfuss", role = "aut"), diff --git a/NEWS.md b/NEWS.md index b9e32e79af..48685cf030 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,7 @@ -# admiral (development version) +# admiral 1.1.1 + +- `derive_extreme_event()` was fixed such that `check_type = "none"` is accepted +again. (#2462) # admiral 1.1.0 diff --git a/R/derive_extreme_event.R b/R/derive_extreme_event.R index 3ad51fa94e..9ddf26fc06 100644 --- a/R/derive_extreme_event.R +++ b/R/derive_extreme_event.R @@ -440,14 +440,19 @@ derive_extreme_event <- function(dataset = NULL, filter_if(event$condition) %>% ungroup() if (!is.null(event$mode)) { - # Check for duplicates - signal_duplicate_records( - dataset = data_events, - by_vars = append(by_vars, event_order), - msg = paste("Check duplicates: ", event$dataset_name, " dataset contains duplicate - records with respect to {.var {replace_values_by_names(by_vars)}}"), - cnd_type = check_type - ) + if (check_type != "none") { + # Check for duplicates + signal_duplicate_records( + dataset = data_events, + by_vars = append(by_vars, event_order), + msg = paste( + "Check duplicates: ", event$dataset_name, + "dataset contains duplicate records with respect to", + "{.var {replace_values_by_names(by_vars)}}" + ), + cnd_type = check_type + ) + } data_events <- filter_extreme( data_events, @@ -458,14 +463,19 @@ derive_extreme_event <- function(dataset = NULL, ) } } else { - # Check for duplicates - signal_duplicate_records( - dataset = data_source, - by_vars = append(by_vars, event_order), - msg = paste("Check duplicates: ", event$dataset_name, " dataset contains duplicate records - with respect to {.var {replace_values_by_names(by_vars)}}"), - cnd_type = check_type - ) + if (check_type != "none") { + # Check for duplicates + signal_duplicate_records( + dataset = data_source, + by_vars = append(by_vars, event_order), + msg = paste( + "Check duplicates: ", event$dataset_name, + "dataset contains duplicate records with respect to", + "{.var {replace_values_by_names(by_vars)}}" + ), + cnd_type = check_type + ) + } data_events <- filter_joined( data_source, @@ -495,15 +505,19 @@ derive_extreme_event <- function(dataset = NULL, ) selected_records <- bind_rows(selected_records_ls) - # Check for duplicates - signal_duplicate_records( - dataset = selected_records, - by_vars = append(by_vars, order), - msg = paste("Check duplicates: the dataset which consists of all records selected - for any of the events defined by {.arg events} contains duplicate records - with respect to {.var {replace_values_by_names(by_vars)}}"), - cnd_type = check_type - ) + if (check_type != "none") { + # Check for duplicates + signal_duplicate_records( + dataset = selected_records, + by_vars = append(by_vars, order), + msg = paste( + "Check duplicates: the dataset which consists of all records selected", + "for any of the events defined by {.arg events} contains duplicate records", + "with respect to {.var {replace_values_by_names(by_vars)}}" + ), + cnd_type = check_type + ) + } ## filter_extreme new_obs <- selected_records %>% diff --git a/tests/testthat/test-derive_extreme_event.R b/tests/testthat/test-derive_extreme_event.R index 4e286f2e28..3016de8e2d 100644 --- a/tests/testthat/test-derive_extreme_event.R +++ b/tests/testthat/test-derive_extreme_event.R @@ -56,7 +56,7 @@ test_that("derive_extreme_event Test 1: `mode` = first", { set_values_to = exprs( PARAMCD = "WSP" ), - check_type = "warning" + check_type = "none" ) expect_dfs_equal(