tests: make more resampling tests work

mlr-org · Jan 24, 2025 · 060073e · 060073e
1 parent 74a4882
commit 060073e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/R/ResamplingFcstCV.R b/R/ResamplingFcstCV.R
@@ -106,26 +106,29 @@ ResamplingFcstCV = R6Class("ResamplingFcstCV",
         setnames(tab, c("row_id", "order"))
         setorderv(tab, "order")
         train_end = tab[.N - horizon, row_id]
-        train_end = rev(seq.int(
+        train_end = seq.int(
           from = train_end,
           by = -pars$step_size,
           length.out = pars$folds
-        ))
+        )
         if (!pars$fixed_window) {
           train_ids = map(train_end, function(x) ids[1L]:x)
         } else {
           train_ids = map(train_end, function(x) (x - window_size + 1L):x)
         }
-        test_ids = map(train_ids, function(x) (x[length(x)] + 1L):(x[length(x)] + horizon))
+        test_ids = map(train_ids, function(x) {
+          n = length(x)
+          (x[n] + 1L):(x[n] + horizon)
+        })
       } else {
         setnames(tab, "..row_id", "row_id")
         setorderv(tab, c(key_cols, order_cols))
         ids = tab[, {
-          train_end = rev(seq.int(
+          train_end = seq.int(
             from = .N - horizon,
             by = -pars$step_size,
             length.out = pars$folds
-          ))
+          )
           if (pars$fixed_window) {
             train_ids = map(train_end, function(x) .SD[(x - window_size + 1L):x, row_id])
           } else {
@@ -137,9 +140,10 @@ ResamplingFcstCV = R6Class("ResamplingFcstCV",
           })
           list(train_ids = train_ids, test_ids = test_ids)
         }, by = key_cols][, .(train_ids, test_ids)]
-
+        train_ids = ids$train_ids
+        test_ids = ids$test_ids
       }
-      list(train = ids$train_ids, test = ids$test_ids)
+      list(train = train_ids, test = test_ids)
     },
 
     .sample_ids = function(ids, ...) {
@@ -149,11 +153,11 @@ ResamplingFcstCV = R6Class("ResamplingFcstCV",
 
       ids = sort(ids)
       train_end = ids[ids <= (max(ids) - horizon) & ids >= window_size]
-      train_end = rev(seq.int(
+      train_end = seq.int(
         from = train_end[length(train_end)],
         by = -pars$step_size,
         length.out = pars$folds
-      ))
+      )
       if (pars$fixed_window) {
         train_ids = map(train_end, function(x) (x - window_size + 1L):x)
       } else {

diff --git a/tests/testthat/test_ResamplingFcstCV.R b/tests/testthat/test_ResamplingFcstCV.R
@@ -1,11 +1,11 @@
 test_that("forecast_cv basic properties", {
-  task = tsk("penguins")
+  task = tsk("airpassengers")
   resampling = rsmp("forecast_cv",
     folds = 10L, horizon = 3L, window_size = 5L, fixed_window = FALSE
   )
-  expect_resampling(resampling, task)
+  expect_resampling(resampling, task, strata = FALSE)
   resampling$instantiate(task)
-  expect_resampling(resampling, task)
+  expect_resampling(resampling, task, strata = FALSE)
   expect_identical(resampling$iters, 10L)
   expect_equal(intersect(resampling$test_set(1L), resampling$train_set(1L)), integer())
   expect_false(resampling$duplicated_ids)
@@ -33,7 +33,7 @@ test_that("forecast_cv works", {
 })
 
 test_that("forecast_cv fixed vs. expanding window", {
-  task = tsk("penguins")
+  task = tsk("airpassengers")
   task$filter(1:30)
 
   # fixed window
@@ -56,7 +56,7 @@ test_that("forecast_cv fixed vs. expanding window", {
 })
 
 test_that("forecast_cv with various parameter combinations", {
-  task = tsk("penguins")
+  task = tsk("airpassengers")
   task$filter(1:30)
 
   # small window, large step size