Simplify plots: version OK with R6 classes

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

diff --git a/pkg/R/F_Persistence.R b/pkg/R/F_Persistence.R
index ce02bd4..220e04c 100644 (file)
--- a/pkg/R/F_Persistence.R
+++ b/pkg/R/F_Persistence.R
@@ -8,7 +8,7 @@ PersistenceForecaster = R6::R6Class("PersistenceForecaster",
        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)
@@ -18,7 +18,7 @@ PersistenceForecaster = R6::R6Class("PersistenceForecaster",
                        repeat
                        {
                                {
-                                       last_serie = private$.data$getCenteredSerie(index)[1:horizon]
+                                       last_serie = data$getCenteredSerie(index)[1:horizon]
                                        index = index - ifelse(same_day,7,1)
                                };
                                if (!any(is.na(last_serie)))