X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2Fplot.R;h=9a7a1ee55181c14704a1cf59f587d22a7ca6944b;hb=25b75559e2d9bf84e2de35b851d93fefdae36e17;hp=c4f9cda76abef4d47187d36a498d53235b89fb85;hpb=fa8078f9658dccadc0f9bcc7b54c13ecda621816;p=talweg.git diff --git a/pkg/R/plot.R b/pkg/R/plot.R index c4f9cda..9a7a1ee 100644 --- a/pkg/R/plot.R +++ b/pkg/R/plot.R @@ -6,20 +6,20 @@ #' @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) { + yrange = quantile( sapply( indices, function(i) { serie = c(data$getCenteredSerie(i)) if (!all(is.na(serie))) range(serie, na.rm=TRUE) c() - }) ), probs=c(0.05,0.95) ) + }), probs=c(0.05,0.95) ) par(mar=c(4.7,5,1,1), cex.axis=1.5, cex.lab=1.5) for (i in seq_along(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) } } @@ -29,16 +29,16 @@ plotCurves <- function(data, indices) #' @description Plot measured curve (in black) and predicted curve (in red) #' #' @param data Object return by \code{getData} -#' @param pred Object as returned by \code{getForecast} +#' @param pred Object as returned by \code{computeForecast} #' @param index Index in forecasts #' #' @export 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,45 +61,53 @@ 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)