Skip to content

Commit b181a85

Browse files
committed
Try non-reactive style on mod_forest.
1 parent 8e34635 commit b181a85

10 files changed

Lines changed: 525 additions & 556 deletions

R/aaa_types.R

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

R/check_call_auto.R

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ check_mod_corr_hm_auto <- function(afmm, datasets, module_id, bm_dataset_name, s
137137
# dv.explorer.parameter::mod_forest
138138
check_mod_forest_auto <- function(afmm, datasets, module_id, bm_dataset_name, group_dataset_name, numeric_numeric_functions,
139139
numeric_factor_functions, subjid_var, cat_var, par_var, visit_var, value_vars, default_cat, default_par,
140-
default_visit, default_value, default_var, default_group, default_categorical_A, default_categorical_B,
141-
err) {
140+
default_visit, default_value, default_var, default_group, default_cont_var, default_categorical_A,
141+
default_categorical_B, err) {
142142
OK <- logical(0)
143143
used_dataset_names <- new.env(parent = emptyenv())
144144
OK[["module_id"]] <- CM$check_module_id("module_id", module_id, err)
@@ -195,6 +195,10 @@ check_mod_forest_auto <- function(afmm, datasets, module_id, bm_dataset_name, gr
195195
flags <- list(optional = TRUE)
196196
OK[["default_group"]] <- OK[["group_dataset_name"]] && CM$check_dataset_colum_name("default_group",
197197
default_group, subkind, flags, group_dataset_name, datasets[[group_dataset_name]], err)
198+
subkind <- list(kind = "numeric", min = NA, max = NA)
199+
flags <- list(optional = TRUE)
200+
OK[["default_cont_var"]] <- OK[["group_dataset_name"]] && CM$check_dataset_colum_name("default_cont_var",
201+
default_cont_var, subkind, flags, group_dataset_name, datasets[[group_dataset_name]], err)
198202
flags <- list(optional = TRUE)
199203
OK[["default_categorical_A"]] <- OK[["default_var"]] && CM$check_choice_from_col_contents("default_categorical_A",
200204
default_categorical_A, flags, "group_dataset_name", datasets[[group_dataset_name]], default_var,

R/mock_forest.R

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
#' @export
55
mock_app_forest <- function(dry_run = FALSE, update_query_string = TRUE, srv_defaults = list(), ui_defaults = list()) {
66
data <- test_data()
7-
bm_dataset <- shiny::reactive({
8-
data[["bm"]]
9-
})
10-
11-
group_dataset <- shiny::reactive({
12-
data[["sl"]]
13-
})
7+
8+
# Patch data to conform with module expectations # TODO: Fix `test_data` instead
9+
for(col in c("CAT1", "CAT2", "CAT3")) data[["sl"]][[col]] <- as.factor(data[["sl"]][[col]])
10+
11+
bm_dataset <- data[["bm"]]
12+
group_dataset <- data[["sl"]]
1413

1514
numeric_numeric_functions <- list(
1615
"Pearson Correlation" = pearson_correlation,
@@ -26,12 +25,20 @@ mock_app_forest <- function(dry_run = FALSE, update_query_string = TRUE, srv_def
2625
),
2726
ui_defaults
2827
)
28+
29+
masks <- shiny::reactive({
30+
list(
31+
bm = rep(TRUE, nrow(bm_dataset)),
32+
group = rep(TRUE, nrow(group_dataset))
33+
)
34+
})
2935

3036
srv_params <- c(
3137
list(
3238
id = "not_ebas",
3339
bm_dataset = bm_dataset,
3440
group_dataset = group_dataset,
41+
masks = masks,
3542
numeric_numeric_functions = numeric_numeric_functions,
3643
numeric_factor_functions = numeric_factor_functions,
3744
subjid_var = "SUBJID",

0 commit comments

Comments
 (0)