X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2FJ_Neighbors.R;h=2caedc58954a16721fd107e1b69647e37a272930;hb=9e0f25f6d5c73008c0ad59ea7b7e097b342f26b3;hp=40341d9eb9cf77df34226a8c0f6f78180d6226ac;hpb=c36568faefc97bb417d355e2084398c1ad1acf92;p=talweg.git

diff --git a/pkg/R/J_Neighbors.R b/pkg/R/J_Neighbors.R
index 40341d9..2caedc5 100644
--- a/pkg/R/J_Neighbors.R
+++ b/pkg/R/J_Neighbors.R
@@ -10,7 +10,8 @@
 #'
 #' @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)
@@ -18,7 +19,10 @@ getNeighborsJumpPredict = function(data, today, memory, horizon, params, ...)
 	weights = params$weights[filter]
 
 	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)] )