X-Git-Url: https://git.auder.net/?p=talweg.git;a=blobdiff_plain;f=pkg%2FR%2FJ_Neighbors.R;fp=pkg%2FR%2FJ_Neighbors.R;h=ceea8037267ee610ef3f09f1ef75bf75b8a8223e;hp=40341d9eb9cf77df34226a8c0f6f78180d6226ac;hb=af718fd5a9a330b13b331e78824a47407a3479ae;hpb=c8a81efd2e8302cde424165539f49e4bb7466fc3

diff --git a/pkg/R/J_Neighbors.R b/pkg/R/J_Neighbors.R
index 40341d9..ceea803 100644
--- a/pkg/R/J_Neighbors.R
+++ b/pkg/R/J_Neighbors.R
@@ -10,15 +10,22 @@
 #'
 #' @aliases J_Neighbors
 #'
-getNeighborsJumpPredict = function(data, today, memory, horizon, params, ...)
+getNeighborsJumpPredict = function(data, today, memory, predict_from, horizon,
+	params, ...)
 {
 	first_day = max(1, today-memory)
 	filter = (params$indices >= first_day)
 	indices = params$indices[filter]
 	weights = params$weights[filter]
 
+	if (is.na(indices[1]))
+		return (NA)
+
 	gaps = sapply(indices, function(i) {
-		head( 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)] )