merge main

R/ResamplingRepeatedSpCVknndm.R

@@ -25,7 +25,7 @@
 #'
 #' task = mlr3spatial::as_task_classif_st(sf::st_as_sf(train_points), "target", positive = "TRUE")
 #'
-#' cv_knndm = rsmp("repeated_spcv_knndm", ppoints = pred_points, repeats = 2)
+#' cv_knndm = rsmp("repeated_spcv_knndm", predpoints = pred_points, repeats = 2)
 #' cv_knndm$instantiate(task)
 
 #' #' ### Individual sets:
@@ -52,7 +52,7 @@ ResamplingRepeatedSpCVKnndm = R6Class("ResamplingRepeatedSpCVKnndm",
               null.ok = TRUE)
           })
         ),
-        ppoints = p_uty(default = NULL,
+        predpoints = p_uty(default = NULL,
           custom_check = crate(function(x) {
             checkmate::check_class(x, "sfc_POINT",
               null.ok = TRUE)
@@ -108,13 +108,13 @@ ResamplingRepeatedSpCVKnndm = R6Class("ResamplingRepeatedSpCVKnndm",
 
       # Set values to default if missing
       mlr3misc::map(
-        c("modeldomain", "ppoints", "space", "maxp", "folds", "clustering",
+        c("modeldomain", "predpoints", "space", "maxp", "folds", "clustering",
           "linkf", "samplesize", "sampling"),
         function(x) private$.set_default_param_values(x)
       )
 
-      if (is.null(pv$modeldomain) && is.null(pv$ppoints)) {
-        stopf("Either 'modeldomain' or 'ppoints' need to be set.")
+      if (is.null(pv$modeldomain) && is.null(pv$predpoints)) {
+        stopf("Either 'modeldomain' or 'predpoints' need to be set.")
       }
 
       if (!is.null(groups)) {
@@ -164,7 +164,7 @@ ResamplingRepeatedSpCVKnndm = R6Class("ResamplingRepeatedSpCVKnndm",
       map(seq_len(pv$repeats), function(i) {
         inds = CAST::knndm(tpoints = points,
           modeldomain = self$param_set$values$modeldomain,
-          ppoints = self$param_set$values$ppoints,
+          predpoints = self$param_set$values$predpoints,
           k = self$param_set$values$folds,
           maxp = self$param_set$values$maxp,
           clustering = self$param_set$values$clustering,

R/ResamplingSpCVKnndm.R

@@ -46,7 +46,7 @@ ResamplingSpCVKnndm = R6Class("ResamplingSpCVKnndm",
               null.ok = TRUE)
           })
         ),
-        ppoints = p_uty(default = NULL,
+        predpoints = p_uty(default = NULL,
           custom_check = crate(function(x) {
             checkmate::check_class(x, "sfc_POINT",
               null.ok = TRUE)
@@ -87,8 +87,8 @@ ResamplingSpCVKnndm = R6Class("ResamplingSpCVKnndm",
 
       pv = self$param_set$values
 
-      if (is.null(pv$modeldomain) && is.null(pv$ppoints)) {
-        stopf("Either 'modeldomain' or 'ppoints' need to be set.")
+      if (is.null(pv$modeldomain) && is.null(pv$predpoints)) {
+        stopf("Either 'modeldomain' or 'predpoints' need to be set.")
       }
 
       if (!is.null(groups)) {
@@ -156,7 +156,7 @@ ResamplingSpCVKnndm = R6Class("ResamplingSpCVKnndm",
       inds = CAST::knndm(
         tpoints = points,
         modeldomain = self$param_set$values$modeldomain,
-        ppoints = self$param_set$values$ppoints,
+        predpoints = self$param_set$values$predpoints,
         k = self$param_set$values$folds,
         maxp = self$param_set$values$maxp,
         clustering = self$param_set$values$clustering,