X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2FJ_Neighbors.R;h=ceea8037267ee610ef3f09f1ef75bf75b8a8223e;hb=8ab6420267542d34b7428f978aa76ba939b9754b;hp=03d334064a43f40d2d307e86e3f8b5c7e95cfafa;hpb=469529710f56c790ae932b45d13fed2e34bcabf2;p=talweg.git

diff --git a/pkg/R/J_Neighbors.R b/pkg/R/J_Neighbors.R
index 03d3340..ceea803 100644
--- a/pkg/R/J_Neighbors.R
+++ b/pkg/R/J_Neighbors.R
@@ -1,18 +1,31 @@
-#' Obtain jump forecast by the Neighbors method
+#' getNeighborsJumpPredict
 #'
-#' @inheritParams getForecast
+#' Apply optimized weights on gaps observed on selected neighbors.
+#' This jump prediction method can only be used in conjunction with the Neighbors
+#' Forecaster, because it makes use of the optimized parameters to re-apply the weights
+#' on the jumps observed at days interfaces of the past neighbors.
+#'
+#' @inheritParams computeForecast
 #' @inheritParams getZeroJumpPredict
-getNeighborsJumpPredict = function(data, today, memory, horizon, params, ...)
+#'
+#' @aliases J_Neighbors
+#'
+getNeighborsJumpPredict = function(data, today, memory, predict_from, 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]
-	if (any(is.na(weights) | is.na(indices)))
+
+	if (is.na(indices[1]))
 		return (NA)
 
 	gaps = sapply(indices, function(i) {
-		data$getSerie(i+1)[1] - tail(data$getSerie(i), 1)
+		if (predict_from >= 2)
+			data$getSerie(i)[predict_from] - data$getSerie(i)[predict_from-1]
+		else
+			head(data$getSerie(i),1) - tail(data$getSerie(i-1),1)
 	})
 	scal_product = weights * gaps
 	norm_fact = sum( weights[!is.na(scal_product)] )