X-Git-Url: https://git.auder.net/?p=talweg.git;a=blobdiff_plain;f=pkg%2FR%2FcomputeForecast.R;h=3537e8a8c2ba090b46989a3aafc88605f2840682;hp=0585e1bdfee0391a780eacea7f30dac6c7047d5f;hb=5e838b3e17465c376ca075b766cf2543c82e9864;hpb=25b75559e2d9bf84e2de35b851d93fefdae36e17

diff --git a/pkg/R/computeForecast.R b/pkg/R/computeForecast.R
index 0585e1b..3537e8a 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)
@@ -21,12 +21,7 @@
 #' @param horizon Number of time steps to predict
 #' @param ... Additional parameters for the forecasting models
 #'
-#' @return A list with the following items
-#' \itemize{
-#'   \item serie: forecasted serie
-#'   \item params: corresponding list of parameters (weights, neighbors...)
-#'   \item index: corresponding index in data object
-#' }
+#' @return An object of class Forecast
 #'
 #' @examples
 #' ts_data = system.file("extdata","pm10_mesures_H_loc.csv",package="talweg")
@@ -50,24 +45,38 @@ 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")
-	indices = sapply( seq_along(indices), function(i) dateIndexToInteger(indices[i], data) )
-	if (any(indices<=0 | indices>data$getSize()))
+	integer_indices = sapply(indices, function(i) dateIndexToInteger(i,data))
+	if (any(integer_indices<=0 | integer_indices>data$getSize()))
 		stop("Indices out of range")
-	indices = sapply(indices, dateIndexToInteger, data)
-	if (!is.character(forecaster))
-		stop("forecaster (name) should be of class character") #pjump could be NULL
+	if (!is.character(forecaster) || !is.character(pjump))
+		stop("forecaster (name) and pjump (function) should be of class character")
 
-	pred = Forecast$new()
+	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 indices)
-	{
-		pred$append(
-			new_serie = forecaster$predictSerie(today, memory, horizon, ...),
-			new_params = forecaster$getParameters(),
-			new_index = today
-		)
-	}
+	forecaster = forecaster_class_name$new( #.pjump =
+		getFromNamespace(paste("get",pjump,"JumpPredict",sep=""), "talweg"))
+
+#oo = forecaster$predictSerie(data, integer_indices[1], memory, horizon, ...)
+#browser()
+
+	library(parallel)
+	ppp <- 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=3)
+
+#browser()
+
+for (i in seq_along(integer_indices))
+{
+	pred$append(
+			new_serie = ppp[[i]]$forecast,
+			new_params = ppp[[i]]$params,
+			new_index_in_data = ppp[[i]]$index
+	)
+}
+
 	pred
 }