fix: as_measures (#1242)

R/BenchmarkResult.R

@@ -175,11 +175,7 @@ BenchmarkResult = R6Class("BenchmarkResult",
     #'
     #' @return [data.table::data.table()].
     score = function(measures = NULL, ids = TRUE, conditions = FALSE, predictions = TRUE) {
-      measures = if (is.null(measures)) {
-        default_measures(self$task_type)
-      } else {
-        assert_measures(as_measures(measures))
-      }
+      measures = assert_measures(as_measures(measures, task_type = self$task_type))
       assert_flag(ids)
       assert_flag(conditions)
       assert_flag(predictions)
@@ -234,11 +230,7 @@ BenchmarkResult = R6Class("BenchmarkResult",
     #' @param predict_sets (`character()`)\cr
     #'   The predict sets.
     obs_loss = function(measures = NULL, predict_sets = "test") {
-      measures = if (is.null(measures)) {
-        default_measures(self$task_type)
-      } else {
-        assert_measures(as_measures(measures))
-      }
+      measures = assert_measures(as_measures(measures, task_type = self$task_type))
       map_dtr(self$resample_results$resample_result,
         function(rr) {
           rr$obs_loss(measures, predict_sets)

R/Prediction.R

@@ -90,11 +90,7 @@ Prediction = R6Class("Prediction",
     #'
     #' @return [Prediction].
     score = function(measures = NULL, task = NULL, learner = NULL, train_set = NULL) {
-      measures = if (is.null(measures)) {
-        default_measures(self$task_type)
-      } else {
-        assert_measures(as_measures(measures))
-      }
+      measures = assert_measures(as_measures(measures, task_type = self$task_type))
       scores = map_dbl(measures, function(m) m$score(prediction = self, task = task, learner = learner, train_set = train_set))
       set_names(scores, ids(measures))
     },
@@ -109,11 +105,7 @@ Prediction = R6Class("Prediction",
     #' Note that some measures such as RMSE, do have an `$obs_loss`, but they require an
     #' additional transformation after aggregation, in this example taking the square-root.
     obs_loss = function(measures = NULL) {
-      measures = if (is.null(measures)) {
-        default_measures(self$task_type)
-      } else {
-        assert_measures(as_measures(measures))
-      }
+      measures = assert_measures(as_measures(measures, task_type = self$task_type))
       get_obs_loss(as.data.table(self), measures)
     },
 

R/ResampleResult.R

@@ -143,11 +143,7 @@ ResampleResult = R6Class("ResampleResult",
     #'
     #' @return [data.table::data.table()].
     score = function(measures = NULL, ids = TRUE, conditions = FALSE, predictions = TRUE) {
-      measures = if (is.null(measures)) {
-        default_measures(self$task_type)
-      } else {
-        assert_measures(as_measures(measures))
-      }
+      measures = assert_measures(as_measures(measures, task_type = self$task_type))
       assert_flag(ids)
       assert_flag(conditions)
       assert_flag(predictions)
@@ -200,11 +196,7 @@ ResampleResult = R6Class("ResampleResult",
     #' @param predict_sets (`character()`)\cr
     #'   The predict sets.
     obs_loss = function(measures = NULL, predict_sets = "test") {
-      measures = if (is.null(measures)) {
-        default_measures(self$task_type)
-      } else {
-        assert_measures(as_measures(measures))
-      }
+      measures = assert_measures(as_measures(measures, task_type = self$task_type))
       tab = map_dtr(self$predictions(predict_sets), as.data.table, .idcol = "iteration")
       get_obs_loss(tab, measures)
     },
@@ -216,11 +208,7 @@ ResampleResult = R6Class("ResampleResult",
     #'
     #' @return Named `numeric()`.
     aggregate = function(measures = NULL) {
-      measures = if (is.null(measures)) {
-        default_measures(self$task_type)
-      } else {
-        assert_measures(as_measures(measures))
-      }
+      measures = assert_measures(as_measures(measures, task_type = self$task_type))
       resample_result_aggregate(self, measures)
     },
 

R/as_measure.R

@@ -10,7 +10,7 @@
 #'
 #' @return [Measure].
 #' @export
-as_measure = function(x, ...) { # nolint
+as_measure = function(x, task_type = NULL, ...) { # nolint
   UseMethod("as_measure")
 }
 
@@ -23,21 +23,21 @@ as_measure.NULL = function(x, task_type = NULL, ...) { # nolint
 
 #' @export
 #' @rdname as_measure
-as_measure.Measure = function(x, clone = FALSE, ...) { # nolint
+as_measure.Measure = function(x, task_type = NULL, clone = FALSE, ...) { # nolint
   assert_empty_ellipsis(...)
   if (isTRUE(clone)) x$clone() else x
 }
 
 #' @export
 #' @rdname as_measure
-as_measures = function(x, ...) { # nolint
+as_measures = function(x, task_type = NULL, ...) { # nolint
   UseMethod("as_measures")
 }
 
 #' @export
 #' @rdname as_measure
-as_measures.default = function(x, ...) { # nolint
-  list(as_measure(x, ...))
+as_measures.default = function(x, task_type = NULL, ...) { # nolint
+  list(as_measure(x, task_type = task_type, ...))
 }
 
 #' @export
@@ -48,6 +48,6 @@ as_measures.NULL = function(x, task_type = NULL, ...) { # nolint
 
 #' @export
 #' @rdname as_measure
-as_measures.list = function(x, ...) { # nolint
-  lapply(x, as_measure, ...)
+as_measures.list = function(x, task_type = NULL, ...) { # nolint
+  lapply(x, as_measure, task_type = NULL, ...)
 }