revise package structure: always predict from 1am to horizon, dataset not cut at...

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

diff --git a/pkg/R/computeError.R b/pkg/R/computeError.R
index 3aa028f..0b1771f 100644 (file)
--- a/pkg/R/computeError.R
+++ b/pkg/R/computeError.R
@@ -13,7 +13,7 @@
 #'   step, averaged on the L forecasting days.
 #'
 #' @export
-computeError = function(data, pred, horizon=data$getStdHorizon())
+computeError = function(data, pred, predict_from, horizon=length(data$getSerie(1)))
 {
        L = pred$getSize()
        mape_day = rep(0, horizon)
@@ -25,8 +25,8 @@ computeError = function(data, pred, horizon=data$getStdHorizon())
        for (i in seq_len(L))
        {
                index = pred$getIndexInData(i)
-               serie = data$getSerie(index+1)[1:horizon]
-               forecast = pred$getForecast(i)[1:horizon]
+               serie = data$getSerie(index)[predict_from:horizon]
+               forecast = pred$getForecast(i)[predict_from:horizon]
                if (!any(is.na(serie)) && !any(is.na(forecast)))
                {
                        nb_no_NA_data = nb_no_NA_data + 1