projects
/
talweg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
investigations on Bruno vs. talweg: a shift overved, and neighbors differ (a bit...
[talweg.git]
/
pkg
/
R
/
F_Neighbors.R
diff --git
a/pkg/R/F_Neighbors.R
b/pkg/R/F_Neighbors.R
index
60eb7b7
..
d63c177
100644
(file)
--- a/
pkg/R/F_Neighbors.R
+++ b/
pkg/R/F_Neighbors.R
@@
-146,12
+146,18
@@
NeighborsForecaster = R6::R6Class("NeighborsForecaster",
}
return ( data$getSerie(tdays[1])[predict_from:horizon] )
}
}
return ( data$getSerie(tdays[1])[predict_from:horizon] )
}
- max_neighbs = 1
2
#TODO: 12 = arbitrary number
+ max_neighbs = 1
0
#TODO: 12 = arbitrary number
if (length(tdays) > max_neighbs)
{
distances2 <- .computeDistsEndo(data, today, tdays, predict_from)
ordering <- order(distances2)
tdays <- tdays[ ordering[1:max_neighbs] ]
if (length(tdays) > max_neighbs)
{
distances2 <- .computeDistsEndo(data, today, tdays, predict_from)
ordering <- order(distances2)
tdays <- tdays[ ordering[1:max_neighbs] ]
+
+ print("VVVVV")
+ print(sort(distances2)[1:max_neighbs])
+ print(integerIndexToDate(today,data))
+ print(lapply(tdays,function(i) integerIndexToDate(i,data)))
+ print(rbind(data$getSeries(tdays-1), data$getSeries(tdays)))
}
}
else
}
}
else
@@
-281,7
+287,8
@@
NeighborsForecaster = R6::R6Class("NeighborsForecaster",
sapply(tdays, function(i) {
delta = lastSerie - c(data$getSerie(i-1),
data$getSerie(i)[if (predict_from>=2) 1:(predict_from-1) else c()])
sapply(tdays, function(i) {
delta = lastSerie - c(data$getSerie(i-1),
data$getSerie(i)[if (predict_from>=2) 1:(predict_from-1) else c()])
- sqrt(mean(delta^2))
+# sqrt(mean(delta^2))
+ sqrt(sum(delta^2))
})
}
})
}