X-Git-Url: https://git.auder.net/?a=blobdiff_plain;ds=sidebyside;f=pkg%2FR%2FForecaster.R;h=2955479007e57eb5b4a63f7d520631e651a7d0bd;hb=af3b84f4cacade7d83221ca0249b546c50ddf340;hp=47160b561647cc80c454de929384f41df412166f;hpb=5d83d8150dc135347d5ef39e5015b88f33fa9ee3;p=talweg.git diff --git a/pkg/R/Forecaster.R b/pkg/R/Forecaster.R index 47160b5..2955479 100644 --- a/pkg/R/Forecaster.R +++ b/pkg/R/Forecaster.R @@ -13,11 +13,11 @@ #' \item{\code{initialize(data, pjump)}} #' {Initialize a Forecaster object with a Data object and a jump prediction function.} #' \item{\code{predictSerie(today,memory,horizon,...)}} -#' {Predict a new serie of \code{horizon} values at day index \code{today} using \code{memory} -#' days in the past.} +#' {Predict a new serie of \code{horizon} values at day index \code{today} +#' using \code{memory} days in the past.} #' \item{\code{predictShape(today,memory,horizon,...)}} -#' {Predict a new shape of \code{horizon} values at day index \code{today} using \code{memory} -#' days in the past.} +#' {Predict a new shape of \code{horizon} values at day index \code{today} +#' using \code{memory} days in the past.} #' \item{\code{getParameters()}} #' {Return (internal) parameters.}} Forecaster = R6::R6Class("Forecaster", @@ -37,9 +37,11 @@ Forecaster = R6::R6Class("Forecaster", { # Parameters (potentially) computed during shape prediction stage predicted_shape = self$predictShape(today, memory, horizon, ...) - predicted_delta = private$.pjump(private$.data,today,memory,horizon,private$.params,...) + predicted_delta = private$.pjump( + private$.data, today, memory, horizon, private$.params, ...) # Predicted shape is aligned it on the end of current day + jump - predicted_shape+tail(private$.data$getSerie(today),1)-predicted_shape[1]+predicted_delta + predicted_shape + tail(private$.data$getSerie(today),1) - + predicted_shape[1] + predicted_delta }, predictShape = function(today, memory, horizon, ...) NULL #empty default implementation: to implement in inherited classes