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

diff --git a/pkg/R/F_Average.R b/pkg/R/F_Average.R
index dab156a..7ec4e90 100644
--- a/pkg/R/F_Average.R
+++ b/pkg/R/F_Average.R
@@ -1,19 +1,14 @@
 #' @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(...)
-		},
-		predictShape = function(today, memory, horizon, ...)
+	public = list(
+		predictShape = function(data, today, memory, horizon, ...)
 		{
 			avg = rep(0., horizon)
 			first_day = max(1, today-memory)