almost finished debug

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

diff --git a/pkg/R/F_Average.R b/pkg/R/F_Average.R
index dab156a..5058825 100644 (file)
--- a/pkg/R/F_Average.R
+++ b/pkg/R/F_Average.R
@@ -1,18 +1,13 @@
 #' @include Forecaster.R
 #'
-#' @title Average Forecaster
+#' Average Forecaster
 #'
-#' @description Return the (pointwise) average of the all the (similar) centered day curves
-#'   in the past. Inherits \code{\link{Forecaster}}
-AverageForecaster = setRefClass(
-       Class = "AverageForecaster",
-       contains = "Forecaster",
+#' Return the (pointwise) average of the all the (similar) centered day curves
+#' in the past. Inherits \code{\link{Forecaster}}
+AverageForecaster = R6::R6Class("AverageForecaster",
+       inherit = Forecaster,
 
-       methods = list(
-               initialize = function(...)
-               {
-                       callSuper(...)
-               },
+       public = list(
                predictShape = function(today, memory, horizon, ...)
                {
                        avg = rep(0., horizon)
@@ -22,7 +17,7 @@ AverageForecaster = setRefClass(
                        repeat
                        {
                                {
-                                       serie_on_horizon = data$getCenteredSerie(index)[1:horizon]
+                                       serie_on_horizon = private$.data$getCenteredSerie(index)[1:horizon]
                                        index = index - 7
                                };
                                if (!any(is.na(serie_on_horizon)))