X-Git-Url: https://git.auder.net/?p=talweg.git;a=blobdiff_plain;f=pkg%2FR%2FF_Persistence.R;fp=pkg%2FR%2FF_Persistence.R;h=7035231f5f798e2db66cd50ac1c67421e054c38a;hp=dde861217a206d310f0f8786c50c156c6b0270ce;hb=af718fd5a9a330b13b331e78824a47407a3479ae;hpb=c8a81efd2e8302cde424165539f49e4bb7466fc3

diff --git a/pkg/R/F_Persistence.R b/pkg/R/F_Persistence.R
index dde8612..7035231 100644
--- a/pkg/R/F_Persistence.R
+++ b/pkg/R/F_Persistence.R
@@ -18,23 +18,21 @@ PersistenceForecaster = R6::R6Class("PersistenceForecaster",
 	inherit = Forecaster,
 
 	public = list(
-		predictShape = function(data, today, memory, horizon, ...)
+		predictShape = function(data, today, memory, predict_from, horizon, ...)
 		{
 			# Return centered last (similar) day curve, avoiding NAs until memory is run
 			first_day = max(1, today-memory)
 			same_day = ifelse(hasArg("same_day"), list(...)$same_day, TRUE)
-			# If 'same_day', get the last known future of similar day: -7 + 1 == -6
-			index = today - ifelse(same_day,6,0)
+			index <- today
 			repeat
 			{
-				{
-					last_serie = data$getCenteredSerie(index)[1:horizon]
-					index = index - ifelse(same_day,7,1)
-				};
-				if (!any(is.na(last_serie)))
-					return (last_serie);
+				# If 'same_day', get the last known future of similar day
+				index = index - ifelse(same_day,7,1)
 				if (index < first_day)
 					return (NA)
+				last_serie = data$getCenteredSerie(index)[predict_from:horizon]
+				if (!any(is.na(last_serie)))
+					return (last_serie)
 			}
 		}
 	)