From 7bde3de0cd61022087c2e616fe968a51325ac2a6 Mon Sep 17 00:00:00 2001 From: Maximilian Muecke Date: Thu, 25 Apr 2024 00:19:29 +0200 Subject: [PATCH] refactor: replace custom warningCondition to warningf and make rename check_ to assert_ for checkmate style behaviour --- R/LearnerClustCMeans.R | 2 +- R/LearnerClustKKMeans.R | 2 +- R/LearnerClustKMeans.R | 2 +- R/LearnerClustMiniBatchKMeans.R | 2 +- R/helper.R | 5 ++--- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/R/LearnerClustCMeans.R b/R/LearnerClustCMeans.R index b3dd9d11..5503f71b 100644 --- a/R/LearnerClustCMeans.R +++ b/R/LearnerClustCMeans.R @@ -62,7 +62,7 @@ LearnerClustCMeans = R6Class("LearnerClustCMeans", ), private = list( .train = function(task) { - check_centers_param(self$param_set$values$centers, task, test_data_frame, "centers") + assert_centers_param(self$param_set$values$centers, task, test_data_frame, "centers") pv = self$param_set$get_values(tags = "train") m = invoke(e1071::cmeans, x = task$data(), .args = pv, .opts = allow_partial_matching) diff --git a/R/LearnerClustKKMeans.R b/R/LearnerClustKKMeans.R index 6e38b5d5..c6bce0f9 100644 --- a/R/LearnerClustKKMeans.R +++ b/R/LearnerClustKKMeans.R @@ -65,7 +65,7 @@ LearnerClustKKMeans = R6Class("LearnerClustKKMeans", ), private = list( .train = function(task) { - check_centers_param(self$param_set$values$centers, task, test_data_frame, "centers") + assert_centers_param(self$param_set$values$centers, task, test_data_frame, "centers") pv = self$param_set$get_values(tags = "train") m = invoke(kernlab::kkmeans, x = as.matrix(task$data()), .args = pv) diff --git a/R/LearnerClustKMeans.R b/R/LearnerClustKMeans.R index 734e0691..1e5815a8 100644 --- a/R/LearnerClustKMeans.R +++ b/R/LearnerClustKMeans.R @@ -56,7 +56,7 @@ LearnerClustKMeans = R6Class("LearnerClustKMeans", warningf("`nstart` parameter is only relevant when `centers` is integer.") } - check_centers_param(self$param_set$values$centers, task, test_data_frame, "centers") + assert_centers_param(self$param_set$values$centers, task, test_data_frame, "centers") pv = self$param_set$get_values(tags = "train") m = invoke(stats::kmeans, x = task$data(), .args = pv) diff --git a/R/LearnerClustMiniBatchKMeans.R b/R/LearnerClustMiniBatchKMeans.R index d1fceb96..f74cc077 100644 --- a/R/LearnerClustMiniBatchKMeans.R +++ b/R/LearnerClustMiniBatchKMeans.R @@ -60,7 +60,7 @@ LearnerClustMiniBatchKMeans = R6Class("LearnerClustMiniBatchKMeans", ), private = list( .train = function(task) { - check_centers_param(self$param_set$values$CENTROIDS, task, test_matrix, "CENTROIDS") + assert_centers_param(self$param_set$values$CENTROIDS, task, test_matrix, "CENTROIDS") if (test_matrix(self$param_set$values$CENTROIDS) && nrow(self$param_set$values$CENTROIDS) != self$param_set$values$clusters) { stopf("`CENTROIDS` must have same number of rows as `clusters`") diff --git a/R/helper.R b/R/helper.R index b1208b0c..2787381a 100644 --- a/R/helper.R +++ b/R/helper.R @@ -1,6 +1,5 @@ warn_prediction_useless = function(id) { - msg = sprintf("Learner '%s' doesn't predict on new data and predictions may not make sense on new data", id) - warning(warningCondition(msg, class = "predictionUselessWarning")) + warningf("Learner '%s' doesn't predict on new data and predictions may not make sense on new data.", id) } allow_partial_matching = list( @@ -9,7 +8,7 @@ allow_partial_matching = list( warnPartialMatchDollar = FALSE ) -check_centers_param = function(centers, task, test_class, name) { +assert_centers_param = function(centers, task, test_class, name) { if (test_class(centers) && ncol(centers) != task$ncol) { stopf("`%s` must have same number of columns as data.", name) }