Skip to content

Commit 15bc6d9

Browse files
authored
Merge pull request #91 from Boehringer-Ingelheim/330557-CM_snippet_sync
Update CM.R
2 parents 14bec97 + ceeb247 commit 15bc6d9

14 files changed

Lines changed: 298 additions & 853 deletions

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: dv.explorer.parameter
22
Type: Package
33
Title: Parameter exploration modules
4-
Version: 0.2.1-9000
4+
Version: 0.2.1-9001
55
Authors@R: c(
66
person("Boehringer-Ingelheim Pharma GmbH & Co.KG", role = c("cph", "fnd")),
77
person(given = "Luis", family = "Moris Fernandez", role = c("aut", "cre"), email = "luis.moris.fernandez@gmail.com"),

NEWS.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
# dv.explorer.parameter 0.2.1-9001
2+
3+
- [NOT USER-FACING] Update CM.R snippet
4+
15
# dv.explorer.parameter 0.2.1-9000
26

3-
- Speed early error feedback
7+
- Faster early error feedback
48

59
# dv.explorer.parameter 0.2.1
610

R/CM.R

Lines changed: 99 additions & 230 deletions
Large diffs are not rendered by default.

R/check_call_auto.R

Lines changed: 150 additions & 158 deletions
Large diffs are not rendered by default.

R/map_afmm_auto.R

Lines changed: 0 additions & 410 deletions
This file was deleted.

R/mod_boxplot.R

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -969,11 +969,10 @@ check_mod_boxplot <- function(
969969
server_wrapper_func
970970
) {
971971

972-
warn <- CM$container()
973972
err <- CM$container()
974973

975974
# TODO: Replace this function with a generic one that performs the checks based on mod_boxplot_API_spec.
976-
# Something along the lines of OK <- CM$check_API(mod_corr_hm_API_spec, args = match.call(), warn, err)
975+
# Something along the lines of OK <- CM$check_API(mod_corr_hm_API_spec, args = match.call(), err)
977976
OK <- check_mod_boxplot_auto(
978977
afmm,
979978
datasets,
@@ -996,7 +995,6 @@ check_mod_boxplot <- function(
996995
default_sub_group,
997996
default_page_group,
998997
server_wrapper_func,
999-
warn,
1000998
err
1001999
)
10021000

@@ -1021,11 +1019,11 @@ check_mod_boxplot <- function(
10211019
check_unique_sub_cat_par_vis(
10221020
datasets, "bm_dataset_name", bm_dataset_name,
10231021
subjid_var, cat_var, par_var, visit_var, anlfl_vars,
1024-
warn = warn, err = err
1022+
err = err
10251023
)
10261024
}
10271025

1028-
res <- list(warnings = warn[["messages"]], errors = err[["messages"]])
1026+
res <- list(errors = err[["messages"]])
10291027
return(res)
10301028
}
10311029

@@ -1035,7 +1033,7 @@ dataset_info_boxplot <- function(bm_dataset_name, group_dataset_name, ...) {
10351033
return(list(all = unique(c(bm_dataset_name, group_dataset_name)), subject_level = group_dataset_name))
10361034
}
10371035

1038-
mod_boxplot <- CM$module(mod_boxplot, check_mod_boxplot, dataset_info_boxplot, map_afmm_mod_boxplot_auto)
1036+
mod_boxplot <- CM$module(mod_boxplot, check_mod_boxplot, dataset_info_boxplot)
10391037

10401038

10411039
# Data manipulation

R/mod_corr_hm.R

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,16 +1003,15 @@ mod_corr_hm_API_spec <- TC$group(
10031003
check_mod_corr_hm <- function(
10041004
afmm, datasets, module_id, bm_dataset_name, subjid_var, cat_var, par_var, visit_var,
10051005
anlfl_vars, value_vars, default_cat, default_par, default_visit, default_value) {
1006-
warn <- CM$container()
10071006
err <- CM$container()
10081007

10091008
# TODO: Replace this function with a generic one that performs the checks based on mod_corr_hm_API_spec.
1010-
# Something along the lines of OK <- CM$check_API(mod_corr_hm_API_spec, args = match.call(), warn, err)
1009+
# Something along the lines of OK <- CM$check_API(mod_corr_hm_API_spec, args = match.call(), err)
10111010

10121011
OK <- check_mod_corr_hm_auto(
10131012
afmm, datasets, module_id, bm_dataset_name, subjid_var, cat_var, par_var, visit_var,
10141013
anlfl_vars, value_vars, default_cat, default_par, default_visit, default_value,
1015-
warn, err
1014+
err
10161015
)
10171016

10181017
# Checks that API spec does not (yet?) capture
@@ -1025,11 +1024,11 @@ check_mod_corr_hm <- function(
10251024
check_unique_sub_cat_par_vis(
10261025
datasets, "bm_dataset_name", bm_dataset_name,
10271026
subjid_var, cat_var, par_var, visit_var, anlfl_vars,
1028-
warn = warn, err = err
1027+
err = err
10291028
)
10301029
}
10311030

1032-
res <- list(warnings = warn[["messages"]], errors = err[["messages"]])
1031+
res <- list(errors = err[["messages"]])
10331032
return(res)
10341033
}
10351034

@@ -1039,4 +1038,4 @@ dataset_info_corr_hm <- function(bm_dataset_name, ...) {
10391038
return(list(all = bm_dataset_name, subject_level = character(0)))
10401039
}
10411040

1042-
mod_corr_hm <- CM$module(mod_corr_hm, check_mod_corr_hm, dataset_info_corr_hm, map_afmm_mod_corr_hm_auto)
1041+
mod_corr_hm <- CM$module(mod_corr_hm, check_mod_corr_hm, dataset_info_corr_hm)

R/mod_forest.R

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1357,17 +1357,16 @@ check_mod_forest <- function(
13571357
numeric_factor_functions, subjid_var, cat_var, par_var, visit_var, value_vars,
13581358
default_cat, default_par, default_visit, default_value, default_var, default_group,
13591359
default_categorical_A, default_categorical_B) {
1360-
warn <- CM$container()
13611360
err <- CM$container()
13621361

13631362
# TODO: Replace this function with a generic one that performs the checks based on mod_forest_API_spec.
1364-
# Something along the lines of OK <- CM$check_API(mod_corr_hm_API_spec, args = match.call(), warn, err)
1363+
# Something along the lines of OK <- CM$check_API(mod_corr_hm_API_spec, args = match.call(), err)
13651364

13661365
OK <- check_mod_forest_auto(
13671366
afmm, datasets, module_id, bm_dataset_name, group_dataset_name, numeric_numeric_functions,
13681367
numeric_factor_functions, subjid_var, cat_var, par_var, visit_var, value_vars,
13691368
default_cat, default_par, default_visit, default_value, default_var, default_group,
1370-
default_categorical_A, default_categorical_B, warn, err
1369+
default_categorical_A, default_categorical_B, err
13711370
)
13721371

13731372
# Checks that API spec does not (yet?) capture
@@ -1381,7 +1380,7 @@ check_mod_forest <- function(
13811380
)
13821381
}
13831382

1384-
res <- list(warnings = warn[["messages"]], errors = err[["messages"]])
1383+
res <- list(errors = err[["messages"]])
13851384
return(res)
13861385
}
13871386

@@ -1391,7 +1390,7 @@ dataset_info_forest <- function(bm_dataset_name, group_dataset_name, ...) {
13911390
return(list(all = unique(c(bm_dataset_name, group_dataset_name)), subject_level = group_dataset_name))
13921391
}
13931392

1394-
mod_forest <- CM$module(mod_forest, check_mod_forest, dataset_info_forest, map_afmm_mod_forest_auto)
1393+
mod_forest <- CM$module(mod_forest, check_mod_forest, dataset_info_forest)
13951394

13961395
# TODO: Move pearson_correlation and spearman_correlation to their own file
13971396
# TODO: Maybe odds_ratio too

R/mod_lineplot.R

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1876,18 +1876,17 @@ check_mod_lineplot <- function(
18761876
default_centrality_fn, default_dispersion_fn, default_cat, default_par,
18771877
default_val, default_visit_var, default_visit_val, default_main_group, default_sub_group,
18781878
default_transparency, default_y_axis_projection) {
1879-
warn <- CM$container()
18801879
err <- CM$container()
18811880

18821881
# TODO: Replace this function with a generic one that performs the checks based on mod_corr_hm_API_spec.
1883-
# Something along the lines of OK <- CM$check_API(mod_corr_hm_API_spec, args = match.call(), warn, err)
1882+
# Something along the lines of OK <- CM$check_API(mod_corr_hm_API_spec, args = match.call(), err)
18841883

18851884
OK <- check_mod_lineplot_auto(
18861885
afmm, datasets, module_id, bm_dataset_name, group_dataset_name, receiver_id, summary_fns,
18871886
subjid_var, cat_var, par_var, visit_vars, cdisc_visit_vars, anlfl_vars, value_vars, additional_listing_vars,
18881887
ref_line_vars, default_centrality_fn, default_dispersion_fn, default_cat, default_par, default_val,
18891888
default_visit_var, default_visit_val, default_main_group, default_sub_group, default_transparency,
1890-
default_y_axis_projection, warn, err
1889+
default_y_axis_projection, err
18911890
)
18921891

18931892
# Checks that API spec does not (yet?) capture
@@ -1897,7 +1896,7 @@ check_mod_lineplot <- function(
18971896
check_unique_sub_cat_par_vis(
18981897
datasets, "bm_dataset_name", bm_dataset_name,
18991898
subjid_var, cat_var, par_var, visit_var, anlfl_vars,
1900-
warn = warn, err = err
1899+
err = err
19011900
)
19021901
}
19031902
}
@@ -1988,7 +1987,7 @@ check_mod_lineplot <- function(
19881987
}
19891988
}
19901989

1991-
res <- list(warnings = warn[["messages"]], errors = err[["messages"]])
1990+
res <- list(errors = err[["messages"]])
19921991
return(res)
19931992
}
19941993

@@ -1998,4 +1997,4 @@ dataset_info_lineplot <- function(bm_dataset_name, group_dataset_name, ...) {
19981997
return(list(all = unique(c(bm_dataset_name, group_dataset_name)), subject_level = group_dataset_name))
19991998
}
20001999

2001-
mod_lineplot <- CM$module(mod_lineplot, check_mod_lineplot, dataset_info_lineplot, map_afmm_mod_lineplot_auto)
2000+
mod_lineplot <- CM$module(mod_lineplot, check_mod_lineplot, dataset_info_lineplot)

R/mod_roc.R

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,15 +1147,14 @@ check_mod_roc <- function(
11471147
afmm, datasets, module_id, pred_dataset_name, resp_dataset_name, group_dataset_name, pred_cat_var,
11481148
pred_par_var, pred_value_vars, pred_visit_var, resp_cat_var, resp_par_var, resp_value_vars,
11491149
resp_visit_var, subjid_var, quantile_type, compute_roc_fn, compute_metric_fn) {
1150-
warn <- CM$container()
11511150
err <- CM$container()
11521151

11531152
# TODO: Replace this function with a generic one that performs the checks based on mod_boxplot_API_spec.
1154-
# Something along the lines of OK <- CM$check_API(mod_corr_hm_API_spec, args = match.call(), warn, err)
1153+
# Something along the lines of OK <- CM$check_API(mod_corr_hm_API_spec, args = match.call(), err)
11551154
OK <- check_mod_roc_auto(
11561155
afmm, datasets, module_id, pred_dataset_name, resp_dataset_name, group_dataset_name, pred_cat_var,
11571156
pred_par_var, pred_value_vars, pred_visit_var, resp_cat_var, resp_par_var, resp_value_vars,
1158-
resp_visit_var, subjid_var, quantile_type, compute_roc_fn, compute_metric_fn, warn, err
1157+
resp_visit_var, subjid_var, quantile_type, compute_roc_fn, compute_metric_fn, err
11591158
)
11601159

11611160
# Checks that API spec does not (yet?) capture
@@ -1171,21 +1170,21 @@ check_mod_roc <- function(
11711170
if (OK[["subjid_var"]] && OK[["pred_cat_var"]] && OK[["pred_par_var"]] && OK[["pred_visit_var"]]) {
11721171
check_unique_sub_cat_par_vis(
11731172
datasets, "pred_dataset_name", pred_dataset_name,
1174-
subjid_var, pred_cat_var, pred_par_var, pred_visit_var, anlfl_vars = NULL, warn = warn, err = err
1173+
subjid_var, pred_cat_var, pred_par_var, pred_visit_var, anlfl_vars = NULL, err = err
11751174
)
11761175
}
11771176

11781177
if (OK[["subjid_var"]] && OK[["resp_cat_var"]] && OK[["resp_par_var"]] && OK[["resp_visit_var"]]) {
11791178
check_unique_sub_cat_par_vis(
11801179
datasets, "resp_dataset_name", resp_dataset_name,
11811180
subjid_var, resp_cat_var, resp_par_var, resp_visit_var, anlfl_vars = NULL,
1182-
warn, err
1181+
err
11831182
)
11841183
}
11851184

11861185
# TODO: check resp_value_vars are binary?
11871186

1188-
res <- list(warnings = warn[["messages"]], errors = err[["messages"]])
1187+
res <- list(errors = err[["messages"]])
11891188
return(res)
11901189
}
11911190

@@ -1198,7 +1197,7 @@ dataset_info_roc <- function(pred_dataset_name, resp_dataset_name, group_dataset
11981197
))
11991198
}
12001199

1201-
mod_roc <- CM$module(mod_roc, check_mod_roc, dataset_info_roc, map_afmm_mod_roc_auto)
1200+
mod_roc <- CM$module(mod_roc, check_mod_roc, dataset_info_roc)
12021201

12031202
# Server Logic
12041203

0 commit comments

Comments
 (0)