From: Benjamin Auder Date: Tue, 21 Feb 2017 00:13:37 +0000 (+0100) Subject: fix plotting; TODO: tests, reports X-Git-Url: https://git.auder.net/images/assets/js/img/pieces/current/git-logo.png?a=commitdiff_plain;h=16b1c049a9c402544d7076cacfe6b00a3785b51f;p=talweg.git fix plotting; TODO: tests, reports --- diff --git a/NOTES b/NOTES index 8bab5f1..9992dfd 100644 --- a/NOTES +++ b/NOTES @@ -30,3 +30,8 @@ Sur exo on doit prédire moyenne du jour au lieu de courbe --------> analyser (? --> use R6 class: https://cran.r-project.org/web/packages/R6/vignettes/Introduction.html https://cran.r-project.org/web/packages/R6/vignettes/Performance.html + +Attention shift data exo hat : PM10(J+1) = f(PM10(j), meteo(j+1)) [contexte apprentissage] + --> hat PM10(j+1) = hat f(PM10(j), hat meteo(j+1)) [contexte previ] + +Variables meteo : NAs ? diff --git a/TODO b/TODO deleted file mode 100644 index 62ae333..0000000 --- a/TODO +++ /dev/null @@ -1,8 +0,0 @@ -variables meteo : NAs ? -pred delta ? -quantifier variablilité conditionnelle / variablilité brute - -Data & Forecast --> R6 classes - -OK : attention shift data exo hat :: PM10(J+1) = f(PM10(j), meteo(j+1)) [contexte apprentissage] - --> hat PM10(j+1) = hat f(PM10(j), hat meteo(j+1)) [contexte previ] diff --git a/pkg/DESCRIPTION b/pkg/DESCRIPTION index f3ee58a..2a29f90 100644 --- a/pkg/DESCRIPTION +++ b/pkg/DESCRIPTION @@ -24,7 +24,6 @@ Collate: 'Data.R' 'Forecaster.R' 'F_Average.R' - 'F_Level.R' 'F_Neighbors.R' 'F_Persistence.R' 'F_Zero.R' diff --git a/pkg/R/getForecast.R b/pkg/R/getForecast.R index 06c2415..b48f3da 100644 --- a/pkg/R/getForecast.R +++ b/pkg/R/getForecast.R @@ -10,7 +10,6 @@ #' \item Neighbors : use values from the k closest neighbors' tomorrows #' \item Average : global average of all the (similar) "tomorrow of past" #' \item Zero : just output 0 (benchmarking purpose) -#' \item Level : output a flat serie repeating the last observed level #' } #' @param pjump How to predict the jump at the interface between two days ? #' \itemize{ diff --git a/pkg/R/plot.R b/pkg/R/plot.R index f4fc3bf..e414798 100644 --- a/pkg/R/plot.R +++ b/pkg/R/plot.R @@ -61,48 +61,48 @@ computeFilaments <- function(data, index, limit=60, plot=TRUE) if (any(is.na(ref_serie))) stop("computeFilaments requires a serie without NAs") L = length(ref_serie) - first_day = ifelse(length(data$getCenteredSerie(1)