Skip to content

Commit 824b586

Browse files
be-marcbe-marc
committed
prefix columns with acq_
1 parent 5eada45 commit 824b586

8 files changed

+20
-20
lines changed

‎R/AcqFunctionStochasticCB.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ AcqFunctionStochasticCB = R6Class("AcqFunctionStochasticCB",
135135
.fun = function(xdt, lambda) {
136136
p = self$surrogate$predict(xdt)
137137
cb = p$mean - self$surrogate_max_to_min * lambda * p$se
138-
data.table(acq_cb = cb, lambda = lambda, lambda_0 = private$.lambda_0)
138+
data.table(acq_cb = cb, acq_lambda = lambda, acq_lambda_0 = private$.lambda_0)
139139
}
140140
)
141141
)

‎R/AcqFunctionStochasticEI.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ AcqFunctionStochasticEI = R6Class("AcqFunctionStochasticEI",
103103
d_norm = d / se
104104
ei = d * pnorm(d_norm) + se * dnorm(d_norm)
105105
ei = ifelse(se < 1e-20, 0, ei)
106-
data.table(acq_ei = ei, epsilon = epsilon, epsilon_0 = private$.epsilon_0)
106+
data.table(acq_ei = ei, acq_epsilon = epsilon, acq_epsilon_0 = private$.epsilon_0)
107107
}
108108
)
109109
)

‎tests/testthat/test_AcqFunctionStochasticCB.R‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ test_that("AcqFunctionStochasticCB works in defaults", {
1919

2020
expect_data_table(optimizer$optimize(instance), nrows = 1)
2121
expect_data_table(instance$archive$data, min.rows = 10)
22-
expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "lambda_0", "lambda"))
22+
expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "acq_lambda_0", "acq_lambda"))
2323

2424
expect_rush_reset(instance$rush)
2525
})
@@ -45,8 +45,8 @@ test_that("AcqFunctionStochasticCB works with uniform sampling", {
4545

4646
expect_data_table(optimizer$optimize(instance), nrows = 1)
4747
expect_data_table(instance$archive$data, min.rows = 10)
48-
expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "lambda_0", "lambda"))
49-
expect_numeric(instance$archive$data$lambda, lower = 1, upper = 3)
48+
expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "acq_lambda_0", "acq_lambda"))
49+
expect_numeric(instance$archive$data$acq_lambda, lower = 1, upper = 3)
5050

5151
expect_rush_reset(instance$rush)
5252
})
@@ -72,8 +72,8 @@ test_that("AcqFunctionStochasticCB works with exponential sampling", {
7272

7373
expect_data_table(optimizer$optimize(instance), nrows = 1)
7474
expect_data_table(instance$archive$data, min.rows = 10)
75-
expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "lambda_0", "lambda"))
76-
expect_numeric(unique(instance$archive$data$lambda), len = 3)
75+
expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "acq_lambda_0", "acq_lambda"))
76+
expect_numeric(unique(instance$archive$data$acq_lambda), len = 3)
7777

7878
expect_rush_reset(instance$rush)
7979
})
@@ -100,9 +100,9 @@ test_that("AcqFunctionStochasticCB works with lambda decay", {
100100

101101
expect_data_table(optimizer$optimize(instance), nrows = 1)
102102
expect_data_table(instance$archive$data, min.rows = 10)
103-
expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "lambda_0", "lambda"))
103+
expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "acq_lambda_0", "acq_lambda"))
104104

105-
expect_numeric(-instance$archive$data$lambda, sorted = TRUE)
105+
expect_numeric(-instance$archive$data$acq_lambda, sorted = TRUE)
106106

107107
expect_rush_reset(instance$rush)
108108
})
@@ -128,9 +128,9 @@ test_that("AcqFunctionStochasticCB works with periodic lambda decay", {
128128

129129
expect_data_table(optimizer$optimize(instance), nrows = 1)
130130
expect_data_table(instance$archive$data, min.rows = 10)
131-
expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "lambda_0", "lambda"))
131+
expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "acq_lambda_0", "acq_lambda"))
132132

133-
expect_numeric(unique(instance$archive$data$lambda), len = 3)
133+
expect_numeric(unique(instance$archive$data$acq_lambda), len = 3)
134134

135135
expect_rush_reset(instance$rush)
136136
})

‎tests/testthat/test_AcqFunctionStochasticEI.R‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ test_that("AcqFunctionStochasticEI works in defaults", {
1919

2020
expect_data_table(optimizer$optimize(instance), nrows = 1)
2121
expect_data_table(instance$archive$data, min.rows = 10)
22-
expect_names(names(instance$archive$data), must.include = c(".already_evaluated", "acq_ei", "epsilon_0", "epsilon"))
23-
expect_numeric(-instance$archive$data$epsilon, sorted = TRUE)
22+
expect_names(names(instance$archive$data), must.include = c(".already_evaluated", "acq_ei", "acq_epsilon_0", "acq_epsilon"))
23+
expect_numeric(-instance$archive$data$acq_epsilon, sorted = TRUE)
2424

2525
expect_rush_reset(instance$rush)
2626
})
@@ -46,7 +46,7 @@ test_that("AcqFunctionStochasticEI works with multiple workers", {
4646

4747
expect_data_table(optimizer$optimize(instance), nrows = 1)
4848
expect_data_table(instance$archive$data, min.rows = 10)
49-
expect_names(names(instance$archive$data), must.include = c(".already_evaluated", "acq_ei", "epsilon_0", "epsilon"))
49+
expect_names(names(instance$archive$data), must.include = c(".already_evaluated", "acq_ei", "acq_epsilon_0", "acq_epsilon"))
5050

5151
expect_rush_reset(instance$rush)
5252
})
@@ -73,8 +73,8 @@ test_that("AcqFunctionStochasticEI works with periodic epsilon decay", {
7373

7474
expect_data_table(optimizer$optimize(instance), nrows = 1)
7575
expect_data_table(instance$archive$data, min.rows = 10)
76-
expect_names(names(instance$archive$data), must.include = c(".already_evaluated", "acq_ei", "epsilon_0", "epsilon"))
77-
expect_numeric(unique(instance$archive$data$epsilon), len = 3)
76+
expect_names(names(instance$archive$data), must.include = c(".already_evaluated", "acq_ei", "acq_epsilon_0", "acq_epsilon"))
77+
expect_numeric(unique(instance$archive$data$acq_epsilon), len = 3)
7878

7979
expect_rush_reset(instance$rush)
8080
})

‎tests/testthat/test_OptimizerAsyncMbo.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ test_that("async optimizer works in defaults", {
1313

1414
expect_data_table(optimizer$optimize(instance), nrows = 1)
1515
expect_data_table(instance$archive$data, min.rows = 10)
16-
expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "lambda_0", "lambda"))
16+
expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "acq_lambda_0", "acq_lambda"))
1717

1818
expect_rush_reset(instance$rush)
1919
})

‎tests/testthat/test_OptimizerAsyncMboADBO.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ test_that("adbo works in defaults", {
1313

1414
expect_data_table(optimizer$optimize(instance), nrows = 1)
1515
expect_data_table(instance$archive$data, min.rows = 20)
16-
expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "lambda_0", "lambda"))
16+
expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "acq_lambda_0", "acq_lambda"))
1717

1818
expect_rush_reset(instance$rush)
1919
})

‎tests/testthat/test_TunerAsyncMbo.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ test_that("async mbo tuner works", {
2222

2323
expect_data_table(tuner$optimize(instance), nrows = 1)
2424
expect_data_table(instance$archive$data, min.rows = 10)
25-
expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "lambda_0", "lambda"))
25+
expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "acq_lambda_0", "acq_lambda"))
2626

2727
expect_rush_reset(instance$rush)
2828
})

‎tests/testthat/test_TunerAsyncMboADBO.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ test_that("async mbo tuner works", {
2222

2323
expect_data_table(tuner$optimize(instance), nrows = 1)
2424
expect_data_table(instance$archive$data, min.rows = 10)
25-
expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "lambda_0", "lambda"))
25+
expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "acq_lambda_0", "acq_lambda"))
2626

2727
expect_rush_reset(instance$rush)
2828
})

0 commit comments

Comments
 (0)