new version, persistence -7 days

[talweg.git] / R / J_Neighbors.R

diff --git a/R/D_Neighbors.R b/R/J_Neighbors.R
similarity index 53%
rename from R/D_Neighbors.R
rename to R/J_Neighbors.R
index dba5f37..03d3340 100644 (file)
--- a/R/D_Neighbors.R
+++ b/R/J_Neighbors.R
@@ -1,20 +1,19 @@
-#' Obtain delta forecast by the Neighbors method
+#' Obtain jump forecast by the Neighbors method
 #'
 #' @inheritParams getForecast
-#' @inheritParams getZeroDeltaForecast
-getNeighborsDeltaForecast = function(data, today, memory, horizon, shape_params, ...)
+#' @inheritParams getZeroJumpPredict
+getNeighborsJumpPredict = function(data, today, memory, horizon, params, ...)
 {
        first_day = max(1, today-memory)
-       filter = shape_params$indices >= first_day
-       indices = shape_params$indices[filter]
-       weights = shape_params$weights[filter]
+       filter = params$indices >= first_day
+       indices = params$indices[filter]
+       weights = params$weights[filter]
        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)
        })
-
        scal_product = weights * gaps
        norm_fact = sum( weights[!is.na(scal_product)] )
        sum(scal_product, na.rm=TRUE) / norm_fact