projects
/
talweg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify plots: version OK with R6 classes
[talweg.git]
/
pkg
/
R
/
F_Neighbors.R
diff --git
a/pkg/R/F_Neighbors.R
b/pkg/R/F_Neighbors.R
index
7a3fbe5
..
238274b
100644
(file)
--- a/
pkg/R/F_Neighbors.R
+++ b/
pkg/R/F_Neighbors.R
@@
-8,20
+8,20
@@
NeighborsForecaster = R6::R6Class("NeighborsForecaster",
inherit = Forecaster,
public = list(
inherit = Forecaster,
public = list(
- predictShape = function(today, memory, horizon, ...)
+ predictShape = function(
data,
today, memory, horizon, ...)
{
# (re)initialize computed parameters
private$.params <- list("weights"=NA, "indices"=NA, "window"=NA)
# Determine indices of no-NAs days followed by no-NAs tomorrows
{
# (re)initialize computed parameters
private$.params <- list("weights"=NA, "indices"=NA, "window"=NA)
# Determine indices of no-NAs days followed by no-NAs tomorrows
- fdays =
private$.data$getCoupleDays(
max(today-memory,1), today-1)
+ fdays =
getNoNA2(data,
max(today-memory,1), today-1)
# Get optional args
simtype = ifelse(hasArg("simtype"), list(...)$simtype, "mix") #or "endo", or "exo"
kernel = ifelse(hasArg("kernel"), list(...)$kernel, "Gauss") #or "Epan"
if (hasArg(h_window))
{
# Get optional args
simtype = ifelse(hasArg("simtype"), list(...)$simtype, "mix") #or "endo", or "exo"
kernel = ifelse(hasArg("kernel"), list(...)$kernel, "Gauss") #or "Epan"
if (hasArg(h_window))
{
- return ( private$.predictShapeAux(
+ return ( private$.predictShapeAux(
data,
fdays, today, horizon, list(...)$h_window, kernel, simtype, TRUE) )
}
fdays, today, horizon, list(...)$h_window, kernel, simtype, TRUE) )
}
@@
-36,12
+36,13
@@
NeighborsForecaster = R6::R6Class("NeighborsForecaster",
for (i in intersect(fdays,sdays))
{
# mix_strategy is never used here (simtype != "mix"), therefore left blank
for (i in intersect(fdays,sdays))
{
# mix_strategy is never used here (simtype != "mix"), therefore left blank
- prediction = private$.predictShapeAux(fdays, i, horizon, h, kernel, simtype, FALSE)
+ prediction = private$.predictShapeAux(data,
+ fdays, i, horizon, h, kernel, simtype, FALSE)
if (!is.na(prediction[1]))
{
nb_jours = nb_jours + 1
error = error +
if (!is.na(prediction[1]))
{
nb_jours = nb_jours + 1
error = error +
- mean((
private$.
data$getCenteredSerie(i+1)[1:horizon] - prediction)^2)
+ mean((data$getCenteredSerie(i+1)[1:horizon] - prediction)^2)
}
}
return (error / nb_jours)
}
}
return (error / nb_jours)
@@
-60,33
+61,31
@@
NeighborsForecaster = R6::R6Class("NeighborsForecaster",
if (simtype == "endo")
{
if (simtype == "endo")
{
- return (private$.predictShapeAux(
+ return (private$.predictShapeAux(
data,
fdays, today, horizon, h_best_endo, kernel, "endo", TRUE))
}
if (simtype == "exo")
{
fdays, today, horizon, h_best_endo, kernel, "endo", TRUE))
}
if (simtype == "exo")
{
- return (private$.predictShapeAux(
+ return (private$.predictShapeAux(
data,
fdays, today, horizon, h_best_exo, kernel, "exo", TRUE))
}
if (simtype == "mix")
{
h_best_mix = c(h_best_endo,h_best_exo)
fdays, today, horizon, h_best_exo, kernel, "exo", TRUE))
}
if (simtype == "mix")
{
h_best_mix = c(h_best_endo,h_best_exo)
- return(private$.predictShapeAux(
+ return(private$.predictShapeAux(
data,
fdays, today, horizon, h_best_mix, kernel, "mix", TRUE))
}
}
),
private = list(
# Precondition: "today" is full (no NAs)
fdays, today, horizon, h_best_mix, kernel, "mix", TRUE))
}
}
),
private = list(
# Precondition: "today" is full (no NAs)
- .predictShapeAux = function(fdays, today, horizon, h, kernel, simtype, final_call)
+ .predictShapeAux = function(
data,
fdays, today, horizon, h, kernel, simtype, final_call)
{
fdays = fdays[ fdays < today ]
# TODO: 3 = magic number
if (length(fdays) < 3)
return (NA)
{
fdays = fdays[ fdays < today ]
# TODO: 3 = magic number
if (length(fdays) < 3)
return (NA)
- data = private$.data #shorthand
-
if (simtype != "exo")
{
h_endo = ifelse(simtype=="mix", h[1], h)
if (simtype != "exo")
{
h_endo = ifelse(simtype=="mix", h[1], h)