X-Git-Url: https://git.auder.net/?p=talweg.git;a=blobdiff_plain;f=pkg%2FR%2FForecaster.R;h=52587602ee9b6c3533c70fc1245b3bb0dc4616e4;hp=cefa1ea676031c2a138793cbd5cbb9622ad86b6e;hb=d2ab47a744d8fb29c03a76a7ca2368dae53f9a57;hpb=4d376294a6286ca1548d978055731dac175ffa3a

diff --git a/pkg/R/Forecaster.R b/pkg/R/Forecaster.R
index cefa1ea..5258760 100644
--- a/pkg/R/Forecaster.R
+++ b/pkg/R/Forecaster.R
@@ -52,15 +52,20 @@ Forecaster = R6::R6Class("Forecaster",
 			private$.pjump <- pjump
 			invisible(self)
 		},
-		predictSerie = function(data, today, memory, horizon, ...)
+		predictSerie = function(data, today, memory, predict_from, horizon, ...)
 		{
 			# Parameters (potentially) computed during shape prediction stage
-			predicted_shape = self$predictShape(data, today, memory, horizon, ...)
-			predicted_delta = private$.pjump(data,today,memory,horizon,private$.params,...)
-			# Predicted shape is aligned it on the end of current day + jump
-			predicted_shape+tail(data$getSerie(today),1)-predicted_shape[1]+predicted_delta
+			predicted_shape = self$predictShape(data,today,memory,predict_from,horizon,...)
+			predicted_delta = private$.pjump(data, today, memory, predict_from, horizon,
+				private$.params, ...)
+
+			# Predicted shape is aligned on the end of current day + jump
+			c( data$getSerie(today)[if (predict_from>=2) 1:(predict_from-1) else c()],
+				predicted_shape - predicted_shape[1] + predicted_delta +
+					ifelse(predict_from>=2,
+						data$getSerie(today)[predict_from-1], tail(data$getSerie(today-1),1)) )
 		},
-		predictShape = function(data, today, memory, horizon, ...)
+		predictShape = function(data, today, memory, predict_from, horizon, ...)
 			NULL #empty default implementation: to implement in inherited classes
 		,
 		getParameters = function()