projects
/
talweg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TODO: comprendre pkoi pas mêmes voisins
[talweg.git]
/
pkg
/
R
/
J_Neighbors.R
diff --git
a/pkg/R/J_Neighbors.R
b/pkg/R/J_Neighbors.R
index
40341d9
..
2caedc5
100644
(file)
--- a/
pkg/R/J_Neighbors.R
+++ b/
pkg/R/J_Neighbors.R
@@
-10,7
+10,8
@@
#'
#' @aliases J_Neighbors
#'
#'
#' @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)
{
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) {
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)] )
})
scal_product = weights * gaps
norm_fact = sum( weights[!is.na(scal_product)] )