Skip to content

Commit 609320f

Browse files
mb706mb706
committed
tests
1 parent dcacf3e commit 609320f

File tree

6 files changed

+55
-55
lines changed

6 files changed

+55
-55
lines changed

‎tests/testthat/test-double_ml_iivm_tuning.R‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ patrick::with_parameters_test_that("Unit tests for tuning of IIVM:",
6363
n_rep = n_rep)
6464

6565
param_grid = list(
66-
"ml_m" = paradox::ParamSet$new(list(
67-
paradox::ParamDbl$new("cp", lower = 0.01, upper = 0.02),
68-
paradox::ParamInt$new("minsplit", lower = 1, upper = 2))),
69-
"ml_g" = paradox::ParamSet$new(list(
70-
paradox::ParamDbl$new("cp", lower = 0.01, upper = 0.02),
71-
paradox::ParamInt$new("minsplit", lower = 1, upper = 2))),
72-
"ml_r" = paradox::ParamSet$new(list(
73-
paradox::ParamDbl$new("cp", lower = 0.01, upper = 0.02),
74-
paradox::ParamInt$new("minsplit", lower = 1, upper = 2))))
66+
"ml_m" = paradox::ps(
67+
cp = paradox::p_dbl(lower = 0.01, upper = 0.02),
68+
minsplit = paradox::p_int(lower = 1, upper = 2)),
69+
"ml_g" = paradox::ps(
70+
cp = paradox::p_dbl(lower = 0.01, upper = 0.02),
71+
minsplit = paradox::p_int(lower = 1, upper = 2)),
72+
"ml_r" = paradox::ps(
73+
cp = paradox::p_dbl(lower = 0.01, upper = 0.02),
74+
minsplit = paradox::p_int(lower = 1, upper = 2)))
7575

7676
double_mliivm_obj_tuned$tune(param_set = param_grid, tune_on_folds = tune_on_folds, tune_settings = tune_settings)
7777
double_mliivm_obj_tuned$fit()

‎tests/testthat/test-double_ml_irm_tuning.R‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ patrick::with_parameters_test_that("Unit tests for tuning of PLR:",
6666
score = score)
6767

6868
param_grid = list(
69-
"ml_g" = paradox::ParamSet$new(list(
70-
paradox::ParamDbl$new("cp", lower = 0.01, upper = 0.02),
71-
paradox::ParamInt$new("minsplit", lower = 1, upper = 2))),
72-
"ml_m" = paradox::ParamSet$new(list(
73-
paradox::ParamDbl$new("cp", lower = 0.01, upper = 0.02),
74-
paradox::ParamInt$new("minsplit", lower = 1, upper = 2))))
69+
"ml_g" = paradox::ps(
70+
cp = paradox::p_dbl(lower = 0.01, upper = 0.02),
71+
minsplit = paradox::p_int(lower = 1, upper = 2)),
72+
"ml_m" = paradox::ps(
73+
cp = paradox::p_dbl(lower = 0.01, upper = 0.02),
74+
minsplit = paradox::p_int(lower = 1, upper = 2)))
7575

7676
double_mlirm_obj_tuned$tune(param_set = param_grid, tune_on_folds = tune_on_folds, tune_settings)
7777
double_mlirm_obj_tuned$fit()

‎tests/testthat/test-double_ml_pliv_exception_handling.R‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ test_that("Unit tests for deprecation warnings of PLIV", {
3535
regexp = msg)
3636

3737
par_grids = list(
38-
"ml_g" = paradox::ParamSet$new(list(
39-
paradox::ParamInt$new("num.trees", lower = 9, upper = 10))),
40-
"ml_m" = paradox::ParamSet$new(list(
41-
paradox::ParamInt$new("num.trees", lower = 10, upper = 11))),
42-
"ml_r" = paradox::ParamSet$new(list(
43-
paradox::ParamInt$new("num.trees", lower = 10, upper = 11))))
38+
"ml_g" = paradox::ps(
39+
num.trees = paradox::p_int(lower = 9, upper = 10)),
40+
"ml_m" = paradox::ps(
41+
num.trees = paradox::p_int(lower = 10, upper = 11)),
42+
"ml_r" = paradox::ps(
43+
num.trees = paradox::p_int(lower = 10, upper = 11)))
4444

4545
msg = paste0("Learner ml_g was renamed to ml_l.")
4646
expect_warning(dml_obj$tune(par_grids),

‎tests/testthat/test-double_ml_pliv_tuning.R‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,19 @@ patrick::with_parameters_test_that("Unit tests for tuning of PLIV",
7979
n_rep = n_rep)
8080

8181
param_grid = list(
82-
"ml_l" = paradox::ParamSet$new(list(
83-
paradox::ParamDbl$new("cp", lower = 0.01, upper = 0.02),
84-
paradox::ParamInt$new("minsplit", lower = 1, upper = 2))),
85-
"ml_m" = paradox::ParamSet$new(list(
86-
paradox::ParamDbl$new("cp", lower = 0.01, upper = 0.02),
87-
paradox::ParamInt$new("minsplit", lower = 1, upper = 2))),
88-
"ml_r" = paradox::ParamSet$new(list(
89-
paradox::ParamDbl$new("cp", lower = 0.01, upper = 0.02),
90-
paradox::ParamInt$new("minsplit", lower = 1, upper = 2))))
82+
"ml_l" = paradox::ps(
83+
cp = paradox::p_dbl(lower = 0.01, upper = 0.02),
84+
minsplit = paradox::p_int(lower = 1, upper = 2)),
85+
"ml_m" = paradox::ps(
86+
cp = paradox::p_dbl(lower = 0.01, upper = 0.02),
87+
minsplit = paradox::p_int(lower = 1, upper = 2)),
88+
"ml_r" = paradox::ps(
89+
cp = paradox::p_dbl(lower = 0.01, upper = 0.02),
90+
minsplit = paradox::p_int(lower = 1, upper = 2)))
9191
if (score == "IV-type") {
92-
param_grid[["ml_g"]] = paradox::ParamSet$new(list(
93-
paradox::ParamDbl$new("cp", lower = 0.01, upper = 0.02),
94-
paradox::ParamInt$new("minsplit", lower = 1, upper = 2)))
92+
param_grid[["ml_g"]] = paradox::ps(
93+
cp = paradox::p_dbl(lower = 0.01, upper = 0.02),
94+
minsplit = paradox::p_int(lower = 1, upper = 2))
9595
tune_settings[["measure"]][["ml_g"]] = "regr.mse"
9696
}
9797

@@ -175,15 +175,15 @@ patrick::with_parameters_test_that("Unit tests for tuning of PLIV (multiple Z)",
175175
n_rep = n_rep)
176176

177177
param_grid = list(
178-
"ml_l" = paradox::ParamSet$new(list(
179-
paradox::ParamDbl$new("cp", lower = 0.01, upper = 0.02),
180-
paradox::ParamInt$new("minsplit", lower = 1, upper = 2))),
181-
"ml_m" = paradox::ParamSet$new(list(
182-
paradox::ParamDbl$new("cp", lower = 0.01, upper = 0.02),
183-
paradox::ParamInt$new("minsplit", lower = 1, upper = 2))),
184-
"ml_r" = paradox::ParamSet$new(list(
185-
paradox::ParamDbl$new("cp", lower = 0.01, upper = 0.02),
186-
paradox::ParamInt$new("minsplit", lower = 1, upper = 2))))
178+
"ml_l" = paradox::ps(
179+
cp = paradox::p_dbl(lower = 0.01, upper = 0.02),
180+
minsplit = paradox::p_int(lower = 1, upper = 2)),
181+
"ml_m" = paradox::ps(
182+
cp = paradox::p_dbl(lower = 0.01, upper = 0.02),
183+
minsplit = paradox::p_int(lower = 1, upper = 2)),
184+
"ml_r" = paradox::ps(
185+
cp = paradox::p_dbl(lower = 0.01, upper = 0.02),
186+
minsplit = paradox::p_int(lower = 1, upper = 2)))
187187

188188
double_mlpliv_obj_tuned$tune(param_set = param_grid, tune_settings = tune_settings, tune_on_folds = tune_on_folds)
189189
double_mlpliv_obj_tuned$fit()

‎tests/testthat/test-double_ml_plr_exception_handling.R‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,10 @@ test_that("Unit tests for deprecation warnings of PLR", {
167167
regexp = msg)
168168

169169
par_grids = list(
170-
"ml_g" = paradox::ParamSet$new(list(
171-
paradox::ParamInt$new("num.trees", lower = 9, upper = 10))),
172-
"ml_m" = paradox::ParamSet$new(list(
173-
paradox::ParamInt$new("num.trees", lower = 10, upper = 11))))
170+
"ml_g" = paradox::ps(
171+
num.trees = paradox::p_int(lower = 9, upper = 10)),
172+
"ml_m" = paradox::ps(
173+
num.trees = paradox::p_int(lower = 10, upper = 11)))
174174

175175
msg = paste0("Learner ml_g was renamed to ml_l.")
176176
expect_warning(dml_obj$tune(par_grids),

‎tests/testthat/test-double_ml_plr_tuning.R‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,17 @@ patrick::with_parameters_test_that("Unit tests for tuning of PLR:",
7979
resolution = 5)
8080

8181
param_grid = list(
82-
"ml_l" = paradox::ParamSet$new(list(
83-
paradox::ParamDbl$new("cp", lower = 0.02, upper = 0.03),
84-
paradox::ParamInt$new("minsplit", lower = 1, upper = 2))),
85-
"ml_m" = paradox::ParamSet$new(list(
86-
paradox::ParamDbl$new("cp", lower = 0.03, upper = 0.04),
87-
paradox::ParamInt$new("minsplit", lower = 2, upper = 3))))
82+
"ml_l" = paradox::ps(
83+
cp = paradox::p_dbl(lower = 0.02, upper = 0.03),
84+
minsplit = paradox::p_int(lower = 1, upper = 2)),
85+
"ml_m" = paradox::ps(
86+
cp = paradox::p_dbl(lower = 0.03, upper = 0.04),
87+
minsplit = paradox::p_int(lower = 2, upper = 3)))
8888

8989
if (score == "IV-type") {
90-
param_grid[["ml_g"]] = paradox::ParamSet$new(list(
91-
paradox::ParamDbl$new("cp", lower = 0.015, upper = 0.025),
92-
paradox::ParamInt$new("minsplit", lower = 3, upper = 4)))
90+
param_grid[["ml_g"]] = paradox::ps(
91+
cp = paradox::p_dbl(lower = 0.015, upper = 0.025),
92+
minsplit = paradox::p_int(lower = 3, upper = 4))
9393
}
9494

9595
double_mlplr_obj_tuned$tune(param_set = param_grid, tune_on_folds = tune_on_folds, tune_settings = tune_sets)

0 commit comments

Comments
 (0)