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

diff --git a/pkg/R/F_Average.R b/pkg/R/F_Average.R
index dab156a..d7febd4 100644
--- a/pkg/R/F_Average.R
+++ b/pkg/R/F_Average.R
@@ -1,19 +1,15 @@
-#' @include Forecaster.R
+#' Average Forecaster
 #'
-#' @title Average Forecaster
+#' Pointwise average of all series of the same (day of week) days in the past.
 #'
-#' @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",
+#' @format R6 class, inherits Forecaster
+#' @alias F_Average
+#'
+AverageForecaster = R6::R6Class("AverageForecaster",
+	inherit = Forecaster,
 
-	methods = list(
-		initialize = function(...)
-		{
-			callSuper(...)
-		},
-		predictShape = function(today, memory, horizon, ...)
+	public = list(
+		predictShape = function(data, today, memory, horizon, ...)
 		{
 			avg = rep(0., horizon)
 			first_day = max(1, today-memory)