X-Git-Url: https://git.auder.net/?a=blobdiff_plain;ds=sidebyside;f=pkg%2FR%2FF_Persistence.R;h=fa5f99f5373b735b63f4618768f0b6eebab9694f;hb=3ddf1c12af0c167fe7d3bb59e63258550270cfc5;hp=ce02bd4a4165571e4088cb3a2cd68343e3b41522;hpb=af3b84f4cacade7d83221ca0249b546c50ddf340;p=talweg.git

diff --git a/pkg/R/F_Persistence.R b/pkg/R/F_Persistence.R
index ce02bd4..fa5f99f 100644
--- a/pkg/R/F_Persistence.R
+++ b/pkg/R/F_Persistence.R
@@ -1,14 +1,22 @@
-#' @include Forecaster.R
-#'
 #' Persistence Forecaster
 #'
-#' Return the last centered (similar) day curve.
-#' Inherits \code{\link{Forecaster}}
+#' Look for the most recent similar day in the past, and return its corresponding curve.
+#'
+#' There are two variations, depending whether "similar day" means "same day in the week"
+#' or "most recent day" (regardless of day type). The corresponding argument is named
+#' "same_day": a value of TRUE implies the former interpretation (same day in week).
+#' If the last similar day has missing values, the next one is searched, and so on until
+#' one full serie is found (if no one is found, NA is returned).
+#'
+#' @docType class
+#' @format R6 class, inherits Forecaster
+#' @aliases F_Persistence
+#'
 PersistenceForecaster = R6::R6Class("PersistenceForecaster",
 	inherit = Forecaster,
 
 	public = list(
-		predictShape = function(today, memory, horizon, ...)
+		predictShape = function(data, today, memory, horizon, ...)
 		{
 			# Return centered last (similar) day curve, avoiding NAs until memory is run
 			first_day = max(1, today-memory)
@@ -18,7 +26,7 @@ PersistenceForecaster = R6::R6Class("PersistenceForecaster",
 			repeat
 			{
 				{
-					last_serie = private$.data$getCenteredSerie(index)[1:horizon]
+					last_serie = data$getCenteredSerie(index)[1:horizon]
 					index = index - ifelse(same_day,7,1)
 				};
 				if (!any(is.na(last_serie)))