Simplify plots: version OK with R6 classes

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

diff --git a/pkg/R/F_Average.R b/pkg/R/F_Average.R
index 5058825..7ec4e90 100644 (file)
--- a/pkg/R/F_Average.R
+++ b/pkg/R/F_Average.R
@@ -8,7 +8,7 @@ AverageForecaster = R6::R6Class("AverageForecaster",
        inherit = Forecaster,
 
        public = list(
-               predictShape = function(today, memory, horizon, ...)
+               predictShape = function(data, today, memory, horizon, ...)
                {
                        avg = rep(0., horizon)
                        first_day = max(1, today-memory)
@@ -17,7 +17,7 @@ AverageForecaster = R6::R6Class("AverageForecaster",
                        repeat
                        {
                                {
-                                       serie_on_horizon = private$.data$getCenteredSerie(index)[1:horizon]
+                                       serie_on_horizon = data$getCenteredSerie(index)[1:horizon]
                                        index = index - 7
                                };
                                if (!any(is.na(serie_on_horizon)))