-
Notifications
You must be signed in to change notification settings - Fork 0
Add a function to create VPC data #12
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
Merged
Merged
Changes from all commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
5e9063e
add more stats
roninsightrx 9bb7eb7
add tests + update docs
roninsightrx c0d09f1
fix tests
roninsightrx 2df4445
minor build fixes
roninsightrx de44619
initial implementation of vpc
roninsightrx ccbb804
update docs + add tests
roninsightrx 683b08e
Apply suggestion from @mccarthy-m-g
roninsightrx c805aa9
Apply suggestion from @mccarthy-m-g
roninsightrx 9843497
Apply suggestion from @mccarthy-m-g
roninsightrx 73edcbe
Apply suggestion from @mccarthy-m-g
roninsightrx 1590ea9
Apply suggestion from @mccarthy-m-g
roninsightrx ab21eb1
Apply suggestion from @mccarthy-m-g
roninsightrx 47de806
Apply suggestion from @mccarthy-m-g
roninsightrx 9d692be
Apply suggestion from @mccarthy-m-g
roninsightrx 59dad41
Apply suggestion from @mccarthy-m-g
roninsightrx 4b22613
Apply suggestion from @mccarthy-m-g
roninsightrx 4c70875
move to S3 + print function + few more stats
roninsightrx 08b9d39
fix tests
roninsightrx e9644f1
Merge branch 'RXR-2867-more-stats' into vpc
roninsightrx a45b78f
Merge branch 'main' into vpc
roninsightrx d187051
Update R/run_vpc.R
roninsightrx 348202e
Update R/run_vpc.R
roninsightrx 4050413
update docws
roninsightrx 70406b5
integrate VPC data simulation into `run_eval()`, add VPC plot method …
mccarthy-m-g 5ae8cad
fix progress bars
roninsightrx cfa2cef
fix + workaround for issues with progressr
roninsightrx 5db6502
more fixes
roninsightrx 62a1566
minor updates progress messages
roninsightrx db98576
update docs
roninsightrx File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| #' Plot method for a `run_eval()` object | ||
| #' | ||
| #' @description | ||
| #' One plot `type` is currently available: | ||
| #' | ||
| #' - `type = "vpc"` plots visual predictive checks (VPC) with [vpc::vpc()]. | ||
| #' | ||
| #' @param x An object. | ||
| #' @param type Character string, indicating the type of plot. Options are `"vpc"`. | ||
| #' @param ... Arguments passed to or from other methods. | ||
| #' | ||
| #' @returns A plot. | ||
| #' @export | ||
| plot.mipdeval_results <- function(x, type = "vpc", ...) { | ||
| type <- rlang::arg_match(type) | ||
| plot_fun <- switch ( | ||
| type, | ||
| vpc = plot_vpc | ||
| ) | ||
| plot_fun(x, ...) | ||
| } | ||
|
|
||
| plot_vpc <- function(res, ...) { | ||
| rlang::check_installed("vpc", reason = "for VPC plotting.") | ||
| rlang::check_dots_used() | ||
| vpc::vpc( | ||
| sim = res$sim, | ||
| obs = dplyr::filter(res$data, .data$EVID == 0), | ||
| ... | ||
| ) | ||
| } |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| # wrapper for purrr::map() that supports parallel processing via | ||
| # furrr::future_map(), as well as optional skipping. | ||
| run <- function(.x, .f, ..., .threads = 1, .skip = FALSE) { | ||
| if (isTRUE(.skip)) { | ||
| return() | ||
| } else if (.threads > 1) { | ||
| # TODO: consider using purrr::in_parallel() in the future when it's stable. | ||
| future::plan(future::multisession, workers = .threads) | ||
| res <- purrr::list_rbind(furrr::future_map( | ||
| .x = .x, .f = .f, ... | ||
| )) | ||
| } else { | ||
| res <- purrr::list_rbind(purrr::map( | ||
| .x = .x, .f = .f, ... | ||
| )) | ||
| } | ||
| } |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| #' Core function for creating visual predictive checks (VPCs). Runs `n_samples` | ||
| #' simulations for a single subject | ||
| #' | ||
| #' @inheritParams run_eval | ||
| #' @inheritParams run_eval_core | ||
| #' @param n_samples Number of iterations to perform for VPC simulations. | ||
| #' @param seed Seed for random number generation. | ||
| #' | ||
| #' @returns data.frame | ||
| run_vpc_core <- function( | ||
| data, | ||
| mod_obj, | ||
| progress_function, | ||
| n_samples = 250, | ||
| seed = 123 | ||
| ) { | ||
| progress_function() | ||
|
|
||
| ## Simulate using PKPDsim | ||
| bins <- NULL | ||
| if(length(mod_obj$bins) > 0) { | ||
| bins <- mod_obj$bins | ||
| } | ||
| dat <- PKPDsim::sim( | ||
| ode = mod_obj$model, | ||
| parameters = mod_obj$parameters, | ||
| omega = mod_obj$omega, | ||
| res_var = mod_obj$ruv, | ||
| t_obs = data$observations$t, | ||
| covariates = data$covariates, | ||
| regimen = data$regimen, | ||
| iov_bins = bins, | ||
| n_ind = n_samples, | ||
| seed = seed, | ||
| only_obs = TRUE, | ||
| verbose = FALSE | ||
| ) | ||
|
|
||
| dat |> | ||
| dplyr::mutate( | ||
| iter = .data$id, | ||
| id = data$id # data, not .data! | ||
| ) |> | ||
| dplyr::select(ID = "id", TIME = "t", DV = "y", ITER = "iter") | ||
| } | ||
|
|
||
| #' Options for VPC simulations | ||
| #' | ||
| #' @param ... These dots are reserved for future extensibility and must be empty. | ||
| #' @inheritParams run_vpc_core | ||
| #' @param skip Logical. Skip VPC simulations? | ||
| #' @param vpc_only Logical. Only return VPC simulations? | ||
| #' | ||
| #' @returns A list. | ||
| #' @export | ||
| vpc_options <- function( | ||
| ..., | ||
| n_samples = 250, | ||
| seed = 123, | ||
| skip = FALSE, | ||
| vpc_only = FALSE | ||
| ) { | ||
| rlang::check_dots_empty() | ||
| out <- list( | ||
| n_samples = vctrs::vec_assert( | ||
| n_samples, ptype = numeric(), size = 1L, arg = "n_samples" | ||
| ), | ||
| seed = seed, | ||
| skip = vctrs::vec_assert( | ||
| skip, ptype = logical(), size = 1L, arg = "skip" | ||
| ), | ||
| vpc_only = vctrs::vec_assert( | ||
| vpc_only, ptype = logical(), size = 1L, arg = "vpc_only" | ||
| ) | ||
| ) | ||
| structure(out, class = "mipdeval_vpc_options") | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
splitting this off as a function didn't work for me