X-Git-Url: https://git.auder.net/?a=blobdiff_plain;ds=sidebyside;f=pkg%2FR%2Fplot.R;h=e4147986d6432dae8733be59cf01a947f44b3cea;hb=16b1c049a9c402544d7076cacfe6b00a3785b51f;hp=c4f9cda76abef4d47187d36a498d53235b89fb85;hpb=fa8078f9658dccadc0f9bcc7b54c13ecda621816;p=talweg.git diff --git a/pkg/R/plot.R b/pkg/R/plot.R index c4f9cda..e414798 100644 --- a/pkg/R/plot.R +++ b/pkg/R/plot.R @@ -6,7 +6,7 @@ #' @param indices Range of indices (integers or dates) #' #' @export -plotCurves <- function(data, indices) +plotCurves <- function(data, indices=seq_len(data$getSize())) { yrange = quantile( range( sapply( indices, function(i) { serie = c(data$getCenteredSerie(i)) @@ -19,7 +19,7 @@ plotCurves <- function(data, indices) { plot(data$getSerie(indices[i]), type="l", ylim=yrange, xlab=ifelse(i==1,"Temps (en heures)",""), ylab=ifelse(i==1,"PM10","")) - if (ii < length(indices)) + if (i < length(indices)) par(new=TRUE) } } @@ -36,9 +36,9 @@ plotCurves <- function(data, indices) plotPredReal <- function(data, pred, index) { horizon = length(pred$getSerie(1)) - par(mar=c(4.7,5,1,1), cex.axis=1.5, cex.lab=1.5, lwd=3) measure = data$getSerie(pred$getIndexInData(index)+1)[1:horizon] yrange = range( pred$getSerie(index), measure ) + 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="Temps (en heures)", ylab="PM10") par(new=TRUE) plot(pred$getSerie(index), type="l", col="#0000FF", ylim=yrange, xlab="", ylab="") @@ -61,38 +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)