revise package structure: always predict from 1am to horizon, dataset not cut at...

[talweg.git] / pkg / tests / testthat / test-computeFilaments.R

diff --git a/pkg/tests/testthat/test-computeFilaments.R b/pkg/tests/testthat/test-computeFilaments.R
index 7e1cafa..6ddd2c5 100644 (file)
--- a/pkg/tests/testthat/test-computeFilaments.R
+++ b/pkg/tests/testthat/test-computeFilaments.R
@@ -4,15 +4,15 @@ test_that("output is as expected on simulated series",
 {
        data = getDataTest(150)
 
-       # index 143 : serie type 2
-       pred = computeForecast(data, 143, "Neighbors", "Zero",
+       # index 144-1 == 143 : serie type 2
+       pred = computeForecast(data, 144, "Neighbors", "Zero", predict_from=8,
                horizon=length(data$getSerie(1)), simtype="endo", local=FALSE, h_window=1)
-       f = computeFilaments(data, pred, 1, limit=60, plot=FALSE)
+       f = computeFilaments(data, pred, 1, 8, limit=60, plot=FALSE)
 
        # Expected output: 50-3-10 series of type 2, then 23 series of type 3 (closest next)
        expect_identical(length(f$neighb_indices), as.integer(60))
        expect_identical(length(f$colors), as.integer(60))
-       expect_equal(f$index, 143)
+       expect_equal(f$index, 144)
        expect_true(all(I(f$neighb_indices) >= 2))
        for (i in 1:37)
        {
@@ -27,16 +27,16 @@ test_that("output is as expected on simulated series",
        expect_match(f$colors[1], "#1*")
        expect_match(f$colors[38], "#E*")
 
-       # index 142 : serie type 1
-       pred = computeForecast(data, 142, "Neighbors", "Zero",
+       # index 143-1 == 142 : serie type 1
+       pred = computeForecast(data, 143, "Neighbors", "Zero", predict_from=8,
                horizon=length(data$getSerie(1)), simtype="endo", local=FALSE, h_window=1)
-       f = computeFilaments(data, pred, 1, limit=50, plot=FALSE)
+       f = computeFilaments(data, pred, 1, 8, limit=50, plot=FALSE)
 
        # Expected output: 50-10-3 series of type 1, then 13 series of type 3 (closest next)
        # NOTE: -10 because only past days with no-NAs tomorrow => exclude type 1 in [60,90[
        expect_identical(length(f$neighb_indices), as.integer(50))
        expect_identical(length(f$colors), as.integer(50))
-       expect_equal(f$index, 142)
+       expect_equal(f$index, 143)
        expect_true(all(I(f$neighb_indices) != 2))
        for (i in 1:37)
        {