projects
/
talweg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revise package structure: always predict from 1am to horizon, dataset not cut at...
[talweg.git]
/
pkg
/
R
/
F_Average.R
diff --git
a/pkg/R/F_Average.R
b/pkg/R/F_Average.R
index
72a79f0
..
6cd2d6e
100644
(file)
--- a/
pkg/R/F_Average.R
+++ b/
pkg/R/F_Average.R
@@
-7,7
+7,7
@@
#' averaged to provide a smooth prediction. This forecast will most of the time be wrong,
#' but will also look plausible enough.
#'
#' averaged to provide a smooth prediction. This forecast will most of the time be wrong,
#' but will also look plausible enough.
#'
-#' @usage AverageForecaster$new(pjump)
+#' @usage
#
AverageForecaster$new(pjump)
#'
#' @docType class
#' @format R6 class, inherits Forecaster
#'
#' @docType class
#' @format R6 class, inherits Forecaster
@@
-17,25
+17,23
@@
AverageForecaster = R6::R6Class("AverageForecaster",
inherit = Forecaster,
public = list(
inherit = Forecaster,
public = list(
- predictShape = function(data, today, memory, horizon, ...)
+ predictShape = function(data, today, memory,
predict_from,
horizon, ...)
{
{
- avg = rep(0.,
horizon
)
+ avg = rep(0.,
(horizon-predict_from+1)
)
first_day = max(1, today-memory)
first_day = max(1, today-memory)
- index
= today-7 + 1
+ index
<- today
nb_no_na_series = 0
repeat
{
nb_no_na_series = 0
repeat
{
- {
- serie_on_horizon = data$getCenteredSerie(index)[1:horizon]
- index = index - 7
- };
+ index = index - 7
+ if (index < first_day)
+ break
+ serie_on_horizon = data$getCenteredSerie(index)[predict_from:horizon]
if (!any(is.na(serie_on_horizon)))
{
avg = avg + serie_on_horizon
nb_no_na_series = nb_no_na_series + 1
if (!any(is.na(serie_on_horizon)))
{
avg = avg + serie_on_horizon
nb_no_na_series = nb_no_na_series + 1
- };
- if (index < first_day)
- break
+ }
}
avg / nb_no_na_series
}
}
avg / nb_no_na_series
}