X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2Fplot.R;h=465b6066d34f18ffed1000246a0f1ba8f65d6423;hb=9e0f25f6d5c73008c0ad59ea7b7e097b342f26b3;hp=2cfaf360be0b95a46fad894b8a242073d897eb98;hpb=3fd7377d1a3c33eb45803e43aab4e47b1c9f03f8;p=talweg.git diff --git a/pkg/R/plot.R b/pkg/R/plot.R index 2cfaf36..465b606 100644 --- a/pkg/R/plot.R +++ b/pkg/R/plot.R @@ -83,7 +83,7 @@ plotError <- function(err, cols=seq_along(err)) plotPredReal <- function(data, pred, index) { prediction = pred$getForecast(index) - measure = data$getSerie( pred$getIndexInData(index) )[length(prediction)] + measure = data$getSerie( pred$getIndexInData(index) )[1:length(prediction)] yrange = range(measure, prediction) par(mar=c(4.7,5,1,1), cex.axis=1.5, cex.lab=1.5, lwd=3) plot(measure, type="l", ylim=yrange, xlab="Time (hours)", ylab="PM10") @@ -172,8 +172,8 @@ computeFilaments <- function(data, pred, index, predict_from, limit=60, plot=TRU ref_serie = c( data$getCenteredSerie( pred$getIndexInData(index)-1 ), data$getCenteredSerie( pred$getIndexInData(index) ) ) centered_series = rbind( - data$getCenteredSeries( pred$getParams(index)$indices ), - data$getCenteredSeries( pred$getParams(index)$indices+1 ) ) + data$getCenteredSeries( pred$getParams(index)$indices-1 ), + data$getCenteredSeries( pred$getParams(index)$indices ) ) yrange = range( ref_serie, quantile(centered_series, probs=c(0.025,0.975), na.rm=TRUE) ) par(mar=c(4.7,5,1,1), cex.axis=1.5, cex.lab=1.5, lwd=2)