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

diff --git a/pkg/R/J_Neighbors.R b/pkg/R/J_Neighbors.R
index 3c9bc30..40341d9 100644
--- a/pkg/R/J_Neighbors.R
+++ b/pkg/R/J_Neighbors.R
@@ -1,20 +1,24 @@
-#' Obtain jump forecast by the Neighbors method
+#' getNeighborsJumpPredict
+#'
+#' 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
 #'
+#' @aliases J_Neighbors
+#'
 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]
 
-	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)
+		head( data$getSerie(i+1),1 ) - tail( data$getSerie(i),1 )
 	})
 	scal_product = weights * gaps
 	norm_fact = sum( weights[!is.na(scal_product)] )