From bc5c3b08c28cdc46c0a52989971dcc0e924bb9c7 Mon Sep 17 00:00:00 2001 From: "Bundfuss, Stefan {MDBB~Basel}" Date: Tue, 6 Jun 2023 17:33:59 +0200 Subject: [PATCH 1/3] #1796 derive_var_basetype_rename: avoid using deprecated functions/arguments --- inst/templates/ad_adeg.R | 2 +- inst/templates/ad_advs.R | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inst/templates/ad_adeg.R b/inst/templates/ad_adeg.R index cbe4b266cb..bc5e24e6bf 100644 --- a/inst/templates/ad_adeg.R +++ b/inst/templates/ad_adeg.R @@ -227,7 +227,7 @@ adeg <- adeg %>% ## Derive baseline flags ---- adeg <- adeg %>% # Calculate BASETYPE - derive_var_basetype( + derive_basetype_records( basetypes = rlang::exprs( "LAST: AFTER LYING DOWN FOR 5 MINUTES" = ATPTN == 815, "LAST: AFTER STANDING FOR 1 MINUTE" = ATPTN == 816, diff --git a/inst/templates/ad_advs.R b/inst/templates/ad_advs.R index 6ff2756246..eb0977ce9d 100644 --- a/inst/templates/ad_advs.R +++ b/inst/templates/ad_advs.R @@ -181,7 +181,7 @@ advs <- advs %>% ## Derive baseline flags ---- advs <- advs %>% # Calculate BASETYPE - derive_var_basetype( + derive_basetype_records( basetypes = exprs( "LAST: AFTER LYING DOWN FOR 5 MINUTES" = ATPTN == 815, "LAST: AFTER STANDING FOR 1 MINUTE" = ATPTN == 816, @@ -251,7 +251,7 @@ advs <- advs %>% by_vars = exprs(STUDYID, USUBJID, PARAMCD, ATPTN), order = exprs(ADT, AVISITN, AVAL), mode = "last", - filter = (4 < AVISITN & AVISITN <= 13 & ANL01FL == "Y" & is.na(DTYPE)), + filter_add = (4 < AVISITN & AVISITN <= 13 & ANL01FL == "Y" & is.na(DTYPE)), set_values_to = exprs( AVISIT = "End of Treatment", AVISITN = 99, From 9d031276c4e15b929c198111a9d04c6ff1c46c80 Mon Sep 17 00:00:00 2001 From: "Bundfuss, Stefan {MDBB~Basel}" Date: Tue, 6 Jun 2023 17:52:48 +0200 Subject: [PATCH 2/3] #1796 derive_var_basetype_rename: update derive_extreme_records() calls --- inst/templates/ad_adlb.R | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inst/templates/ad_adlb.R b/inst/templates/ad_adlb.R index 35e8f08630..22275b11a5 100644 --- a/inst/templates/ad_adlb.R +++ b/inst/templates/ad_adlb.R @@ -385,7 +385,7 @@ adlb <- adlb %>% order = exprs(AVAL, ADT, AVISITN), mode = "first", # "AVISITN < 9997" to evaluate only real visits - filter = (!is.na(AVAL) & ONTRTFL == "Y" & AVISITN < 9997), + filter_add = (!is.na(AVAL) & ONTRTFL == "Y" & AVISITN < 9997), set_values_to = exprs( AVISITN = 9997, AVISIT = "POST-BASELINE MINIMUM", @@ -398,7 +398,7 @@ adlb <- adlb %>% order = exprs(desc(AVAL), ADT, AVISITN), mode = "first", # "AVISITN < 9997" to evaluate only real visits - filter = (!is.na(AVAL) & ONTRTFL == "Y" & AVISITN < 9997), + filter_add = (!is.na(AVAL) & ONTRTFL == "Y" & AVISITN < 9997), set_values_to = exprs( AVISITN = 9998, AVISIT = "POST-BASELINE MAXIMUM", @@ -411,7 +411,7 @@ adlb <- adlb %>% order = exprs(ADT, AVISITN), mode = "last", # "AVISITN < 9997" to evaluate only real visits - filter = (ONTRTFL == "Y" & AVISITN < 9997), + filter_add = (ONTRTFL == "Y" & AVISITN < 9997), set_values_to = exprs( AVISITN = 9999, AVISIT = "POST-BASELINE LAST", From a52bff3e0b13634b4687c83d2f9e406a6d5c2411 Mon Sep 17 00:00:00 2001 From: "Bundfuss, Stefan {MDBB~Basel}" Date: Tue, 6 Jun 2023 17:54:58 +0200 Subject: [PATCH 3/3] #1796 derive_var_basetype_rename: remove rlang:: --- inst/templates/ad_adeg.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inst/templates/ad_adeg.R b/inst/templates/ad_adeg.R index bc5e24e6bf..523491a82b 100644 --- a/inst/templates/ad_adeg.R +++ b/inst/templates/ad_adeg.R @@ -228,7 +228,7 @@ adeg <- adeg %>% adeg <- adeg %>% # Calculate BASETYPE derive_basetype_records( - basetypes = rlang::exprs( + basetypes = exprs( "LAST: AFTER LYING DOWN FOR 5 MINUTES" = ATPTN == 815, "LAST: AFTER STANDING FOR 1 MINUTE" = ATPTN == 816, "LAST: AFTER STANDING FOR 3 MINUTES" = ATPTN == 817,