prefix columns with acq_

mlr-org · Nov 5, 2024 · 824b586 · 824b586
1 parent 5eada45
commit 824b586
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/R/AcqFunctionStochasticCB.R b/R/AcqFunctionStochasticCB.R
@@ -135,7 +135,7 @@ AcqFunctionStochasticCB = R6Class("AcqFunctionStochasticCB",
     .fun = function(xdt, lambda) {
       p = self$surrogate$predict(xdt)
       cb = p$mean - self$surrogate_max_to_min * lambda * p$se
-      data.table(acq_cb = cb, lambda = lambda, lambda_0 = private$.lambda_0)
+      data.table(acq_cb = cb,  acq_lambda = lambda, acq_lambda_0 = private$.lambda_0)
     }
   )
 )

diff --git a/R/AcqFunctionStochasticEI.R b/R/AcqFunctionStochasticEI.R
@@ -103,7 +103,7 @@ AcqFunctionStochasticEI = R6Class("AcqFunctionStochasticEI",
       d_norm = d / se
       ei = d * pnorm(d_norm) + se * dnorm(d_norm)
       ei = ifelse(se < 1e-20, 0, ei)
-      data.table(acq_ei = ei, epsilon = epsilon, epsilon_0 = private$.epsilon_0)
+      data.table(acq_ei = ei, acq_epsilon = epsilon, acq_epsilon_0 = private$.epsilon_0)
     }
   )
 )

diff --git a/tests/testthat/test_AcqFunctionStochasticCB.R b/tests/testthat/test_AcqFunctionStochasticCB.R
@@ -19,7 +19,7 @@ test_that("AcqFunctionStochasticCB works in defaults", {
 
   expect_data_table(optimizer$optimize(instance), nrows = 1)
   expect_data_table(instance$archive$data, min.rows = 10)
-  expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "lambda_0", "lambda"))
+  expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "acq_lambda_0", "acq_lambda"))
 
   expect_rush_reset(instance$rush)
 })
@@ -45,8 +45,8 @@ test_that("AcqFunctionStochasticCB works with uniform sampling", {
 
   expect_data_table(optimizer$optimize(instance), nrows = 1)
   expect_data_table(instance$archive$data, min.rows = 10)
-  expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "lambda_0", "lambda"))
-  expect_numeric(instance$archive$data$lambda, lower = 1, upper = 3)
+  expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "acq_lambda_0", "acq_lambda"))
+  expect_numeric(instance$archive$data$acq_lambda, lower = 1, upper = 3)
 
   expect_rush_reset(instance$rush)
 })
@@ -72,8 +72,8 @@ test_that("AcqFunctionStochasticCB works with exponential sampling", {
 
   expect_data_table(optimizer$optimize(instance), nrows = 1)
   expect_data_table(instance$archive$data, min.rows = 10)
-  expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "lambda_0", "lambda"))
-  expect_numeric(unique(instance$archive$data$lambda), len = 3)
+  expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "acq_lambda_0", "acq_lambda"))
+  expect_numeric(unique(instance$archive$data$acq_lambda), len = 3)
 
   expect_rush_reset(instance$rush)
 })
@@ -100,9 +100,9 @@ test_that("AcqFunctionStochasticCB works with lambda decay", {
 
   expect_data_table(optimizer$optimize(instance), nrows = 1)
   expect_data_table(instance$archive$data, min.rows = 10)
-  expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "lambda_0", "lambda"))
+  expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "acq_lambda_0", "acq_lambda"))
 
-  expect_numeric(-instance$archive$data$lambda, sorted = TRUE)
+  expect_numeric(-instance$archive$data$acq_lambda, sorted = TRUE)
 
   expect_rush_reset(instance$rush)
 })
@@ -128,9 +128,9 @@ test_that("AcqFunctionStochasticCB works with periodic lambda decay", {
 
   expect_data_table(optimizer$optimize(instance), nrows = 1)
   expect_data_table(instance$archive$data, min.rows = 10)
-  expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "lambda_0", "lambda"))
+  expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "acq_lambda_0", "acq_lambda"))
 
-  expect_numeric(unique(instance$archive$data$lambda), len = 3)
+  expect_numeric(unique(instance$archive$data$acq_lambda), len = 3)
 
   expect_rush_reset(instance$rush)
 })
diff --git a/tests/testthat/test_AcqFunctionStochasticEI.R b/tests/testthat/test_AcqFunctionStochasticEI.R
@@ -19,8 +19,8 @@ test_that("AcqFunctionStochasticEI works in defaults", {
 
   expect_data_table(optimizer$optimize(instance), nrows = 1)
   expect_data_table(instance$archive$data, min.rows = 10)
-  expect_names(names(instance$archive$data), must.include = c(".already_evaluated", "acq_ei", "epsilon_0", "epsilon"))
-  expect_numeric(-instance$archive$data$epsilon, sorted = TRUE)
+  expect_names(names(instance$archive$data), must.include = c(".already_evaluated", "acq_ei", "acq_epsilon_0", "acq_epsilon"))
+  expect_numeric(-instance$archive$data$acq_epsilon, sorted = TRUE)
 
   expect_rush_reset(instance$rush)
 })
@@ -46,7 +46,7 @@ test_that("AcqFunctionStochasticEI works with multiple workers", {
 
   expect_data_table(optimizer$optimize(instance), nrows = 1)
   expect_data_table(instance$archive$data, min.rows = 10)
-  expect_names(names(instance$archive$data), must.include = c(".already_evaluated", "acq_ei", "epsilon_0", "epsilon"))
+  expect_names(names(instance$archive$data), must.include = c(".already_evaluated", "acq_ei", "acq_epsilon_0", "acq_epsilon"))
 
   expect_rush_reset(instance$rush)
 })
@@ -73,8 +73,8 @@ test_that("AcqFunctionStochasticEI works with periodic epsilon decay", {
 
   expect_data_table(optimizer$optimize(instance), nrows = 1)
   expect_data_table(instance$archive$data, min.rows = 10)
-  expect_names(names(instance$archive$data), must.include = c(".already_evaluated", "acq_ei", "epsilon_0", "epsilon"))
-  expect_numeric(unique(instance$archive$data$epsilon), len = 3)
+  expect_names(names(instance$archive$data), must.include = c(".already_evaluated", "acq_ei", "acq_epsilon_0", "acq_epsilon"))
+  expect_numeric(unique(instance$archive$data$acq_epsilon), len = 3)
 
   expect_rush_reset(instance$rush)
 })
diff --git a/tests/testthat/test_OptimizerAsyncMbo.R b/tests/testthat/test_OptimizerAsyncMbo.R
@@ -13,7 +13,7 @@ test_that("async optimizer works in defaults", {
 
   expect_data_table(optimizer$optimize(instance), nrows = 1)
   expect_data_table(instance$archive$data, min.rows = 10)
-  expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "lambda_0", "lambda"))
+  expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "acq_lambda_0", "acq_lambda"))
 
   expect_rush_reset(instance$rush)
 })

diff --git a/tests/testthat/test_OptimizerAsyncMboADBO.R b/tests/testthat/test_OptimizerAsyncMboADBO.R
@@ -13,7 +13,7 @@ test_that("adbo works in defaults", {
 
   expect_data_table(optimizer$optimize(instance), nrows = 1)
   expect_data_table(instance$archive$data, min.rows = 20)
-  expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "lambda_0", "lambda"))
+  expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "acq_lambda_0", "acq_lambda"))
 
   expect_rush_reset(instance$rush)
 })

diff --git a/tests/testthat/test_TunerAsyncMbo.R b/tests/testthat/test_TunerAsyncMbo.R
@@ -22,7 +22,7 @@ test_that("async mbo tuner works", {
 
   expect_data_table(tuner$optimize(instance), nrows = 1)
   expect_data_table(instance$archive$data, min.rows = 10)
-  expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "lambda_0", "lambda"))
+  expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "acq_lambda_0", "acq_lambda"))
 
   expect_rush_reset(instance$rush)
 })

diff --git a/tests/testthat/test_TunerAsyncMboADBO.R b/tests/testthat/test_TunerAsyncMboADBO.R
@@ -22,7 +22,7 @@ test_that("async mbo tuner works", {
 
   expect_data_table(tuner$optimize(instance), nrows = 1)
   expect_data_table(instance$archive$data, min.rows = 10)
-  expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "lambda_0", "lambda"))
+  expect_names(names(instance$archive$data), must.include = c("acq_cb", ".already_evaluated", "acq_lambda_0", "acq_lambda"))
 
   expect_rush_reset(instance$rush)
 })