X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2FF_Average.R;h=5058825c7d9fa7916f1aa4ead566f0b5c5a06e2e;hb=af3b84f4cacade7d83221ca0249b546c50ddf340;hp=dab156a7ba2d437fe99cdb77165f2cf3cb6562cd;hpb=469529710f56c790ae932b45d13fed2e34bcabf2;p=talweg.git

diff --git a/pkg/R/F_Average.R b/pkg/R/F_Average.R
index dab156a..5058825 100644
--- 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)))