add realtime option, slightly refactor data acquisition

[talweg.git] / pkg / R / F_Persistence.R

diff --git a/pkg/R/F_Persistence.R b/pkg/R/F_Persistence.R
index 39e043c..79cfe3c 100644 (file)
--- a/pkg/R/F_Persistence.R
+++ b/pkg/R/F_Persistence.R
@@ -4,21 +4,24 @@
 #'
 #' Return the last centered (similar) day curve.
 #' Inherits \code{\link{Forecaster}}
+#'
 PersistenceForecaster = R6::R6Class("PersistenceForecaster",
-       inherit = "Forecaster",
+       inherit = Forecaster,
 
        public = list(
-               predictShape = function(today, memory, horizon, ...)
+               predictShape = function(data, today, memory, horizon, ...)
                {
                        # Return centered last (similar) day curve, avoiding NAs until memory is run
                        first_day = max(1, today-memory)
                        same_day = ifelse(hasArg("same_day"), list(...)$same_day, TRUE)
+                       realtime = ifelse(hasArg("realtime"), list(...)$realtime, FALSE)
                        # If 'same_day', get the last known future of similar day: -7 + 1 == -6
                        index = today - ifelse(same_day,6,0)
                        repeat
                        {
                                {
-                                       last_serie = data$getCenteredSerie(index)[1:horizon]
+                                       last_serie =
+                                               data$getCenteredSerie(index,hat=(index==today && realtime))[1:horizon]
                                        index = index - ifelse(same_day,7,1)
                                };
                                if (!any(is.na(last_serie)))