X-Git-Url: https://git.auder.net/?p=talweg.git;a=blobdiff_plain;f=pkg%2FR%2FF_Average.R;h=bee1974540341e0b20cc03f5de3aeec7bd79f54d;hp=6cd2d6e93b3160dbcde46060180314b902a06f90;hb=638f27f4296727aff62b56643beb9f42aa5b57ef;hpb=adf76c2a1fbeb7cfee31e1ce439a29a02373ee82 diff --git a/pkg/R/F_Average.R b/pkg/R/F_Average.R index 6cd2d6e..bee1974 100644 --- a/pkg/R/F_Average.R +++ b/pkg/R/F_Average.R @@ -23,6 +23,7 @@ AverageForecaster = R6::R6Class("AverageForecaster", first_day = max(1, today-memory) index <- today nb_no_na_series = 0 + opera = ifelse(hasArg("opera"), list(...)$opera, FALSE) repeat { index = index - 7 @@ -35,6 +36,23 @@ AverageForecaster = R6::R6Class("AverageForecaster", nb_no_na_series = nb_no_na_series + 1 } } + if (!opera) + { + # The same, in the future + index <- today + repeat + { + index = index + 7 + if (index > data$getSize()) + break + serie_on_horizon = data$getCenteredSerie(index)[predict_from:horizon] + if (!any(is.na(serie_on_horizon))) + { + avg = avg + serie_on_horizon + nb_no_na_series = nb_no_na_series + 1 + } + } + } avg / nb_no_na_series } )