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

diff --git a/pkg/R/computeForecast.R b/pkg/R/computeForecast.R
index ec6fa07..d635560 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)
@@ -19,6 +19,7 @@
 #' }
 #' @param memory Data depth (in days) to be used for prediction
 #' @param horizon Number of time steps to predict
+#' @param ncores Number of cores for parallel execution (1 to disable)
 #' @param ... Additional parameters for the forecasting models
 #'
 #' @return An object of class Forecast
@@ -39,28 +40,49 @@
 #' }}
 #' @export
 computeForecast = function(data, indices, forecaster, pjump,
-	memory=Inf, horizon=data$getStdHorizon(), ...)
+	memory=Inf, horizon=data$getStdHorizon(), ncores=3, ...)
 {
 	# (basic) Arguments sanity checks
 	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"))
-	for (today in integer_indices)
+	forecaster = forecaster_class_name$new( #.pjump =
+		getFromNamespace(paste("get",pjump,"JumpPredict",sep=""), "talweg"))
+
+	if (ncores > 1 && requireNamespace("parallel",quietly=TRUE))
+	{
+		p <- parallel::mclapply(seq_along(integer_indices), function(i) {
+			list(
+				"forecast" = forecaster$predictSerie(data, integer_indices[i], memory, horizon, ...),
+				"params"= forecaster$getParameters(),
+				"index" = integer_indices[i] )
+			}, mc.cores=ncores)
+	}
+	else
+	{
+		p <- lapply(seq_along(integer_indices), function(i) {
+			list(
+				"forecast" = forecaster$predictSerie(data, integer_indices[i], memory, horizon, ...),
+				"params"= forecaster$getParameters(),
+				"index" = integer_indices[i] )
+			})
+	}
+
+	# TODO: find a way to fill pred in //...
+	for (i in seq_along(integer_indices))
 	{
 		pred$append(
-			new_serie = forecaster$predictSerie(today, memory, horizon, ...),
-			new_params = forecaster$getParameters(),
-			new_index = today
+			new_serie = p[[i]]$forecast,
+			new_params = p[[i]]$params,
+			new_index_in_data = p[[i]]$index
 		)
 	}
 	pred