Merge branch 'main' into release

mlr-org · Nov 7, 2024 · 8c17383 · 8c17383
2 parents d8117b0 + c9d4ee1
commit 8c17383
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 4 deletions.
diff --git a/R/OptimizerAsyncDesignPoints.R b/R/OptimizerAsyncDesignPoints.R
@@ -32,7 +32,7 @@ OptimizerAsyncDesignPoints = R6Class("OptimizerAsyncDesignPoints",
         id = "design_points",
         param_set = param_set,
         param_classes = c("ParamLgl", "ParamInt", "ParamDbl", "ParamFct", "ParamUty"),
-        properties = c("dependencies", "single-crit", "multi-crit"),
+        properties = c("dependencies", "single-crit", "multi-crit", "async"),
         packages = "rush",
         label = "Asynchronous Design Points",
         man = "bbotk::mlr_optimizers_async_design_points"

diff --git a/R/OptimizerAsyncGridSearch.R b/R/OptimizerAsyncGridSearch.R
@@ -40,7 +40,7 @@ OptimizerAsyncGridSearch = R6Class("OptimizerAsyncGridSearch",
         id = "async_grid_search",
         param_set = param_set,
         param_classes = c("ParamLgl", "ParamInt", "ParamDbl", "ParamFct"),
-        properties = c("dependencies", "single-crit", "multi-crit"),
+        properties = c("dependencies", "single-crit", "multi-crit", "async"),
         packages = "rush",
         label = "Asynchronous Grid Search",
         man = "bbotk::mlr_optimizers_async_grid_search"

diff --git a/R/OptimizerAsyncRandomSearch.R b/R/OptimizerAsyncRandomSearch.R
@@ -25,7 +25,7 @@ OptimizerAsyncRandomSearch = R6Class("OptimizerAsyncRandomSearch",
         id = "async_random_search",
         param_set = ps(),
         param_classes = c("ParamLgl", "ParamInt", "ParamDbl", "ParamFct"),
-        properties = c("dependencies", "single-crit", "multi-crit"),
+        properties = c("dependencies", "single-crit", "multi-crit", "async"),
         packages = "rush",
         label = "Asynchronous Random Search",
         man = "bbotk::mlr_optimizers_random_search"

diff --git a/R/bbotk_reflections.R b/R/bbotk_reflections.R
@@ -24,7 +24,7 @@ bbotk_reflections = new.env(parent = emptyenv())
 
 ### optimizer_properties
 bbotk_reflections$optimizer_properties = c(
-  "dependencies", "single-crit", "multi-crit"
+  "dependencies", "single-crit", "multi-crit", "async"
 )
 
 ### objective_properties

diff --git a/tests/testthat/test_OptimizerAsync.R b/tests/testthat/test_OptimizerAsync.R
@@ -105,3 +105,32 @@ test_that("OptimizerAsync throws an error when all workers are lost", {
 
   expect_rush_reset(instance$rush)
 })
+
+test_that("restarting the optimization works", {
+  skip_on_cran()
+  skip_if_not_installed("rush")
+  flush_redis()
+  library(rush)
+
+  rush_plan(n_workers = 2)
+
+  instance = oi_async(
+    objective = OBJ_2D,
+    search_space = PS_2D,
+    terminator = trm("evals", n_evals = 5L),
+  )
+
+  optimizer = opt("async_random_search")
+  optimizer$optimize(instance)
+
+  expect_data_table(instance$archive$data, min.rows = 5L)
+
+  Sys.sleep(1)
+
+  instance$terminator$param_set$values$n_evals = 30L
+
+  optimizer = opt("async_random_search")
+  optimizer$optimize(instance)
+
+  expect_data_table(instance$archive$data, min.rows = 30L)
+})