X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2FcomputeForecast.R;h=8cf8861a39b33909aed575c2d587f6c12a05feaa;hb=98e958cab563866f8e00886b54336018a2e8bc97;hp=ec6fa0728bf18ca1de54faf97edefb867415b9cb;hpb=a66a84b56467194852f2faee15f4725759b24158;p=talweg.git

diff --git a/pkg/R/computeForecast.R b/pkg/R/computeForecast.R
index ec6fa07..8cf8861 100644
--- a/pkg/R/computeForecast.R
+++ b/pkg/R/computeForecast.R
@@ -1,6 +1,6 @@
-#' @title get Forecast
+#' Compute forecast
 #'
-#' @description Predict time-series curves for the selected days indices (lines in data).
+#' Predict time-series curves for the selected days indices (lines in data).
 #'
 #' @param data Dataset, object of type \code{Data} output of \code{getData}
 #' @param indices Days indices where to forecast (the day after)
@@ -45,22 +45,22 @@ computeForecast = function(data, indices, forecaster, pjump,
 	horizon = as.integer(horizon)[1]
 	if (horizon<=0 || horizon>length(data$getCenteredSerie(2)))
 		stop("Horizon too short or too long")
-	integer_indices = sapply(seq_along(indices), function(i) dateIndexToInteger(indices[i],data))
+	integer_indices = sapply(indices, function(i) dateIndexToInteger(i,data))
 	if (any(integer_indices<=0 | integer_indices>data$getSize()))
 		stop("Indices out of range")
 	if (!is.character(forecaster) || !is.character(pjump))
 		stop("forecaster (name) and pjump (function) should be of class character")
 
-	pred = Forecast$new( dates=sapply( indices, integerIndexToDate, data ) )
+	pred = Forecast$new( sapply(indices, function(i) integerIndexToDate(i,data)) )
 	forecaster_class_name = getFromNamespace(paste(forecaster,"Forecaster",sep=""), "talweg")
-	forecaster = forecaster_class_name$new(data=data,
-		pjump = getFromNamespace(paste("get",pjump,"JumpPredict",sep=""), "talweg"))
+	forecaster = forecaster_class_name$new( #.pjump =
+		getFromNamespace(paste("get",pjump,"JumpPredict",sep=""), "talweg"))
 	for (today in integer_indices)
 	{
 		pred$append(
-			new_serie = forecaster$predictSerie(today, memory, horizon, ...),
+			new_serie = forecaster$predictSerie(data, today, memory, horizon, ...),
 			new_params = forecaster$getParameters(),
-			new_index = today
+			new_index_in_data = today
 		)
 	}
 	pred