Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closes #1968 compute multiple variables in derive_param_computed() #2036

Merged
merged 21 commits into from
Aug 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
8907e2a
#1968 compute_multiple_vars: update arguments of derive_param_computed()
bundfussr Jul 28, 2023
8f6230f
#1968 compute_multiple_vars: update documentation
bundfussr Jul 28, 2023
e5a4478
Merge branch 'devel' into 1968_compute_multiple_vars@devel
bundfussr Jul 28, 2023
ab55517
#1968 compute_multiple_vars: update documentation
bundfussr Jul 28, 2023
e8c533f
#1968 compute_multiple_vars: style files
bundfussr Jul 28, 2023
2abae76
#1968 compute_multiple_vars: fix R-CMD checks
bundfussr Jul 28, 2023
881a449
Merge branch 'devel' into 1968_compute_multiple_vars@devel
bundfussr Aug 1, 2023
f78811a
#1968 compute_multiple_vars: update error message of get_hori_data()
bundfussr Aug 1, 2023
9a6abae
Merge branch 'devel' into 1968_compute_multiple_vars@devel
bundfussr Aug 2, 2023
8836a8d
#1968 compute_multiple_vars: improve documentation
bundfussr Aug 2, 2023
ec9be99
Merge branch 'devel' into 1968_compute_multiple_vars@devel
bundfussr Aug 2, 2023
0d50024
#1968 compute_multiple_vars: use deprecation badge
bundfussr Aug 2, 2023
d9587a6
Merge branch '1968_compute_multiple_vars@devel' of github.com:pharmav…
bundfussr Aug 2, 2023
97c0da3
Merge branch 'devel' into 1968_compute_multiple_vars@devel
ddsjoberg Aug 3, 2023
ecb6158
#1968 compute_multiple_vars: use deprecation badge
bundfussr Aug 3, 2023
bbd9280
Merge branch '1968_compute_multiple_vars@devel' of github.com:pharmav…
bundfussr Aug 3, 2023
f6b4eea
Update NEWS.md
bms63 Aug 10, 2023
b3fd3b6
Merge branch 'devel' into 1968_compute_multiple_vars@devel
bms63 Aug 10, 2023
b08fcfb
#1968 compute_multiple_vars: use @keywords internal
bundfussr Aug 17, 2023
841742e
Merge branch 'devel' into 1968_compute_multiple_vars@devel
bundfussr Aug 17, 2023
a0d7650
#1968 compute_multiple_vars: fix typo in NEWS.md
bundfussr Aug 17, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@

- The function `derive_var_extreme_flag()` has a new function argument, `flag_all` that additionally flags all records if the first or last record is not unique. (#1979)

- The function `derive_param_computed()` was enhanced: (#1968)

- The `analysis_value` and `analysis_var` arguments were deprecated in favor of
`set_values_to`. This enables users to compute more than one variable.
- The `keep_nas` argument was added. If it is set to `TRUE`, observations are
created even if values contributing to the computed values are `NA`.

- The function `derive_vars_dy()` is updated to avoid potential error when the input `dataset` with columns ending with `temp`. (#2012)


Expand Down Expand Up @@ -40,6 +47,9 @@
- The `filter` argument in `derive_extreme_records()` was deprecated in favor of
the `filter_add` using the next phase of the deprecation process. (#1950)

- The `analysis_value` and `analysis_var` arguments in `derive_param_computed()`
were deprecated in favor of `set_values_to` (#1968).

- The `na_val` argument in `derive_var_shift()` has been deprecated in favor of
`missing_value` using the first phase of the deprecation process. (#2014)

Expand Down
24 changes: 16 additions & 8 deletions R/derive_adeg_params.R
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
#'
#' Permitted Values: A variable of the input dataset or a function call
#'
#' @inheritParams derive_param_map
#'
#' @inheritParams derive_param_computed
#'
#' @seealso [compute_qtc()]
Expand Down Expand Up @@ -152,12 +154,14 @@ derive_param_qtc <- function(dataset,
filter = !!filter,
parameters = c(qt_code, rr_code),
by_vars = by_vars,
analysis_value = compute_qtc(
qt = !!sym(paste0("AVAL.", qt_code)),
rr = !!sym(paste0("AVAL.", rr_code)),
method = !!method
),
set_values_to = set_values_to
set_values_to = exprs(
AVAL = compute_qtc(
qt = !!sym(paste0("AVAL.", qt_code)),
rr = !!sym(paste0("AVAL.", rr_code)),
method = !!method
),
!!!set_values_to
)
)
}

Expand Down Expand Up @@ -269,6 +273,8 @@ compute_qtc <- function(qt, rr, method) {
#'
#' Permitted Values: character value
#'
#' @inheritParams derive_param_map
#'
#' @inheritParams derive_param_computed
#'
#' @inheritParams derive_param_qtc
Expand Down Expand Up @@ -339,8 +345,10 @@ derive_param_rr <- function(dataset,
filter = !!filter,
parameters = c(hr_code),
by_vars = by_vars,
analysis_value = compute_rr(!!sym(paste0("AVAL.", hr_code))),
set_values_to = set_values_to
set_values_to = exprs(
AVAL = compute_rr(!!sym(paste0("AVAL.", hr_code))),
!!!set_values_to
)
)
}

Expand Down
30 changes: 24 additions & 6 deletions R/derive_advs_params.R
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@
#'
#' *Permitted Values:* character value
#'
#' @param set_values_to Variables to be set
#'
#' The specified variables are set to the specified values for the new
#' observations. For example `exprs(PARAMCD = "MAP")` defines the parameter code
#' for the new parameter.
#'
#' *Permitted Values*: List of variable-value pairs
#'
#' @inheritParams derive_param_computed
#'
#' @inheritParams derive_param_qtc
Expand Down Expand Up @@ -148,8 +156,10 @@ derive_param_map <- function(dataset,
filter = !!filter,
parameters = c(sysbp_code, diabp_code, hr_code),
by_vars = by_vars,
analysis_value = !!analysis_value,
set_values_to = set_values_to
set_values_to = exprs(
AVAL = !!analysis_value,
!!!set_values_to
)
)
}

Expand Down Expand Up @@ -271,6 +281,8 @@ compute_map <- function(diabp, sysbp, hr = NULL) {
#'
#' *Permitted Values:* list of variables
#'
#' @inheritParams derive_param_map
#'
#' @inheritParams derive_param_computed
#'
#' @inheritParams derive_param_qtc
Expand Down Expand Up @@ -423,8 +435,10 @@ derive_param_bsa <- function(dataset,
filter = !!filter,
parameters = parameters,
by_vars = by_vars,
analysis_value = !!bsa_formula,
set_values_to = set_values_to,
set_values_to = exprs(
AVAL = !!bsa_formula,
!!!set_values_to
),
constant_parameters = constant_parameters,
constant_by_vars = constant_by_vars
)
Expand Down Expand Up @@ -572,6 +586,8 @@ compute_bsa <- function(height = height,
#'
#' *Permitted Values:* list of variables
#'
#' @inheritParams derive_param_map
#'
#' @inheritParams derive_param_computed
#'
#' @inheritParams derive_param_qtc
Expand Down Expand Up @@ -710,8 +726,10 @@ derive_param_bmi <- function(dataset,
filter = !!filter,
parameters = parameters,
by_vars = by_vars,
analysis_value = !!bmi_formula,
set_values_to = set_values_to,
set_values_to = exprs(
AVAL = !!bmi_formula,
!!!set_values_to
),
constant_parameters = constant_parameters,
constant_by_vars = constant_by_vars
)
Expand Down
Loading