Merge pull request #284 from mlr-org/optimizer_chain_column_name

fix: rename optimizer column in OptimizerBatchChain to .optimizer_id

Author: sumny

R/OptimizerBatchChain.R

@@ -142,8 +142,8 @@ OptimizerBatchChain = R6Class("OptimizerBatchChain", inherit = OptimizerBatch,
         optimizer = private$.optimizers[[i]]
         optimizer$param_set$values = self$param_set$.__enclos_env__$private$.sets[[i]]$values
         optimizer$optimize(inner_inst)
-        inner_inst$archive$data$batch_nr = max(inst$archive$data$batch_nr, 0L) + inner_inst$archive$data$batch_nr
-        inner_inst$archive$data$optimizer = private$.ids[i]
+        set(inner_inst$archive$data, j = "batch_nr", value = max(inst$archive$data$batch_nr, 0L) + inner_inst$archive$data$batch_nr)
+        set(inner_inst$archive$data, j = ".optimizer_id", value = private$.ids[i])
         inst$archive$data = rbind(inst$archive$data, inner_inst$archive$data, fill = TRUE)
         inner_inst$archive$data = data.table()
         if (terminator$is_terminated(inst$archive)) {

man/Objective.Rd

@@ -4,32 +4,32 @@ test_that("OptimizerBatchChain", {
     terminators = list(trm("evals", n_evals = 10L), trm("evals", n_evals = 10L)))
   expect_class(z$optimizer, "OptimizerBatchChain")
   expect_output(print(z$optimizer), "OptimizerBatchChain")
-  expect_identical(z$instance$archive$data[optimizer == "OptimizerBatchRandomSearch"]$batch_nr, 1:10)
-  expect_identical(z$instance$archive$data[optimizer == "OptimizerBatchGridSearch"]$batch_nr, 11:20)
+  expect_identical(z$instance$archive$data[.optimizer_id == "OptimizerBatchRandomSearch"]$batch_nr, 1:10)
+  expect_identical(z$instance$archive$data[.optimizer_id == "OptimizerBatchGridSearch"]$batch_nr, 11:20)
 
   z = test_optimizer_2d("chain", term_evals = 20L,
     optimizers = list(opt("random_search"), opt("grid_search")),
     terminators = list(trm("evals", n_evals = 10L), trm("evals", n_evals = 10L)))
   expect_class(z$optimizer, "OptimizerBatchChain")
   expect_output(print(z$optimizer), "OptimizerBatchChain")
-  expect_identical(z$instance$archive$data[optimizer == "OptimizerBatchRandomSearch"]$batch_nr, 1:10)
-  expect_identical(z$instance$archive$data[optimizer == "OptimizerBatchGridSearch"]$batch_nr, 11:20)
+  expect_identical(z$instance$archive$data[.optimizer_id == "OptimizerBatchRandomSearch"]$batch_nr, 1:10)
+  expect_identical(z$instance$archive$data[.optimizer_id == "OptimizerBatchGridSearch"]$batch_nr, 11:20)
 
   z = test_optimizer_2d("chain", term_evals = 20L,
     optimizers = list(opt("random_search", batch_size = 10L), opt("grid_search", batch_size = 10L)),
     terminators = list(trm("evals", n_evals = 10L), trm("evals", n_evals = 10L)))
   expect_class(z$optimizer, "OptimizerBatchChain")
   expect_output(print(z$optimizer), "OptimizerBatchChain")
-  expect_identical(unique(z$instance$archive$data[optimizer == "OptimizerBatchRandomSearch"]$batch_nr), 1L)
-  expect_identical(unique(z$instance$archive$data[optimizer == "OptimizerBatchGridSearch"]$batch_nr), 2L)
+  expect_identical(unique(z$instance$archive$data[.optimizer_id == "OptimizerBatchRandomSearch"]$batch_nr), 1L)
+  expect_identical(unique(z$instance$archive$data[.optimizer_id == "OptimizerBatchGridSearch"]$batch_nr), 2L)
 
   z = test_optimizer_dependencies("chain", term_evals = 20L,
     optimizers = list(opt("random_search"), opt("grid_search")),
     terminators = list(trm("evals", n_evals = 10L), trm("evals", n_evals = 10L)))
   expect_class(z$optimizer, "OptimizerBatchChain")
   expect_output(print(z$optimizer), "OptimizerBatchChain")
-  expect_identical(z$instance$archive$data[optimizer == "OptimizerBatchRandomSearch"]$batch_nr, 1:10)
-  expect_identical(z$instance$archive$data[optimizer == "OptimizerBatchGridSearch"]$batch_nr, 11:20)
+  expect_identical(z$instance$archive$data[.optimizer_id == "OptimizerBatchRandomSearch"]$batch_nr, 1:10)
+  expect_identical(z$instance$archive$data[.optimizer_id == "OptimizerBatchGridSearch"]$batch_nr, 11:20)
 
   # random restarts
   terminator = trm("none")
@@ -45,7 +45,7 @@ test_that("OptimizerBatchChain", {
     terminators = list(trm("evals", n_evals = 10L), trm("evals", n_evals = 10L)),
     real_evals = 20L
   )
-  expect_identical(unique(z$instance$archive$data$optimizer), c("OptimizerBatchGenSA", "OptimizerBatchGenSA_1"))
+  expect_identical(unique(z$instance$archive$data$.optimizer_id), c("OptimizerBatchGenSA", "OptimizerBatchGenSA_1"))
 
   # packages, properties, param_set, etc.
   optimizer = OptimizerBatchChain$new(optimizers = list(opt("random_search"), opt("gensa")))