new version, persistence -7 days

[talweg.git] / R / F_Average.R

diff --git a/R/S_Average.R b/R/F_Average.R
similarity index 68%
rename from R/S_Average.R
rename to R/F_Average.R
index 819531d..dab156a 100644 (file)
--- a/R/S_Average.R
+++ b/R/F_Average.R
@@ -1,19 +1,19 @@
-#' @include ShapeForecaster.R
+#' @include Forecaster.R
 #'
-#' @title Average Shape Forecaster
+#' @title Average Forecaster
 #'
 #' @description Return the (pointwise) average of the all the (similar) centered day curves
-#'   in the past. Inherits \code{\link{ShapeForecaster}}
-AverageShapeForecaster = setRefClass(
-       Class = "AverageShapeForecaster",
-       contains = "ShapeForecaster",
+#'   in the past. Inherits \code{\link{Forecaster}}
+AverageForecaster = setRefClass(
+       Class = "AverageForecaster",
+       contains = "Forecaster",
 
        methods = list(
                initialize = function(...)
                {
                        callSuper(...)
                },
-               predict = function(today, memory, horizon, ...)
+               predictShape = function(today, memory, horizon, ...)
                {
                        avg = rep(0., horizon)
                        first_day = max(1, today-memory)