Merge branch 'main' into release

mlr-org · Apr 24, 2024 · 0c9fd46 · 0c9fd46
2 parents 17abd0c + 702e21f
commit 0c9fd46
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/R/marshal.R b/R/marshal.R
@@ -81,7 +81,7 @@ learner_marshal = function(.learner, ...) {
 learner_marshaled = function(.learner) {
   # no need to check for 'marshal' property as this method should only be available for such learners
   if (is.null(.learner$model)) {
-    stopf("Cannot check marshaled status, Learner '%s' has not been trained yet", .learner$id)
+    return(FALSE)
   }
   is_marshaled_model(model = .learner$model)
 }

diff --git a/inst/testthat/helper_expectations.R b/inst/testthat/helper_expectations.R
@@ -413,7 +413,7 @@ expect_marshalable_learner = function(learner, task) {
   # (un)marshal only possible after training
   testthat::expect_error(learner$marshal(), "has not been trained")
   testthat::expect_error(learner$unmarshal(), "has not been trained")
-  testthat::expect_error(learner$marshaled, "has not been trained")
+  testthat::expect_equal(learner$marshaled, FALSE)
 
   learner$train(task)
   model = learner$model

diff --git a/tests/testthat/test_marshal.R b/tests/testthat/test_marshal.R
@@ -3,7 +3,7 @@ test_that("learner methods", {
   task = tsk("iris")
   expect_error(learner_marshal(learner), "not been trained")
   expect_error(learner_unmarshal(learner), "not been trained")
-  expect_error(learner_marshaled(learner), "not been trained")
+  expect_false(learner_marshaled(learner))
 
   learner$train(task)
   expect_false(learner_marshaled(learner))