add realtime option, slightly refactor data acquisition

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

diff --git a/pkg/R/J_Neighbors.R b/pkg/R/J_Neighbors.R
index 03d3340..351fbf9 100644 (file)
--- a/pkg/R/J_Neighbors.R
+++ b/pkg/R/J_Neighbors.R
@@ -1,18 +1,21 @@
 #' Obtain jump forecast by the Neighbors method
 #'
-#' @inheritParams getForecast
+#' @inheritParams computeForecast
 #' @inheritParams getZeroJumpPredict
+#'
 getNeighborsJumpPredict = function(data, today, memory, horizon, params, ...)
 {
        first_day = max(1, today-memory)
-       filter = params$indices >= first_day
+       filter = (params$indices >= first_day)
        indices = params$indices[filter]
        weights = params$weights[filter]
+       realtime = ifelse(hasArg("realtime"), list(...)$realtime, FALSE)
+
        if (any(is.na(weights) | is.na(indices)))
                return (NA)
 
        gaps = sapply(indices, function(i) {
-               data$getSerie(i+1)[1] - tail(data$getSerie(i), 1)
+               data$getSerie(i+1,hat=(realtime && i+1==today))[1] - tail(data$getSerie(i), 1)
        })
        scal_product = weights * gaps
        norm_fact = sum( weights[!is.na(scal_product)] )