Simplify plots: version OK with R6 classes

[talweg.git] / pkg / R / computeForecast.R

diff --git a/pkg/R/computeForecast.R b/pkg/R/computeForecast.R
index f430190..8cf8861 100644 (file)
--- a/pkg/R/computeForecast.R
+++ b/pkg/R/computeForecast.R
@@ -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