X-Git-Url: https://git.auder.net/?p=talweg.git;a=blobdiff_plain;f=pkg%2FR%2Fplot.R;h=52b077bea6cf71eff9d816cf0be4fea2f5a50530;hp=4cafd7d5f9dc6bdbb71c7e8d648beec1a10c371a;hb=4e25de2cf40b946ac6e8c2abc824637a249941d1;hpb=d09b09b0c811305405caf871d467f1a5ab34770f

diff --git a/pkg/R/plot.R b/pkg/R/plot.R
index 4cafd7d..52b077b 100644
--- a/pkg/R/plot.R
+++ b/pkg/R/plot.R
@@ -14,7 +14,7 @@ plotCurves <- function(data, indices=seq_len(data$getSize()))
 	for (i in seq_along(indices))
 	{
 		plot(series[,i], type="l", ylim=yrange,
-			xlab=ifelse(i==1,"Temps (en heures)",""), ylab=ifelse(i==1,"PM10",""))
+			xlab=ifelse(i==1,"Time (hours)",""), ylab=ifelse(i==1,"PM10",""))
 		if (i < length(indices))
 			par(new=TRUE)
 	}
@@ -41,32 +41,32 @@ plotError <- function(err, cols=seq_along(err))
 	yrange = range( sapply(1:L, function(i) ( err[[i]]$abs$day ) ), na.rm=TRUE )
 	for (i in seq_len(L))
 	{
-		plot(err[[i]]$abs$day, type="l", xlab=ifelse(i==1,"Temps (heures)",""),
-			ylab=ifelse(i==1,"Moyenne |y - y_hat|",""), ylim=yrange, col=cols[i])
+		plot(err[[i]]$abs$day, type="l", xlab=ifelse(i==1,"Time (hours)",""),
+			ylab=ifelse(i==1,"Mean |y - y_hat|",""), ylim=yrange, col=cols[i])
 		if (i < L)
 			par(new=TRUE)
 	}
 	yrange = range( sapply(1:L, function(i) ( err[[i]]$abs$indices ) ), na.rm=TRUE )
 	for (i in seq_len(L))
 	{
-		plot(err[[i]]$abs$indices, type="l", xlab=ifelse(i==1,"Temps (jours)",""),
-			ylab=ifelse(i==1,"Moyenne |y - y_hat|",""), ylim=yrange, col=cols[i])
+		plot(err[[i]]$abs$indices, type="l", xlab=ifelse(i==1,"Time (days)",""),
+			ylab=ifelse(i==1,"Mean |y - y_hat|",""), ylim=yrange, col=cols[i])
 		if (i < L)
 			par(new=TRUE)
 	}
 	yrange = range( sapply(1:L, function(i) ( err[[i]]$MAPE$day ) ), na.rm=TRUE )
 	for (i in seq_len(L))
 	{
-		plot(err[[i]]$MAPE$day, type="l", xlab=ifelse(i==1,"Temps (heures)",""),
-			ylab=ifelse(i==1,"MAPE moyen",""), ylim=yrange, col=cols[i])
+		plot(err[[i]]$MAPE$day, type="l", xlab=ifelse(i==1,"Time (hours)",""),
+			ylab=ifelse(i==1,"Mean MAPE",""), ylim=yrange, col=cols[i])
 		if (i < L)
 			par(new=TRUE)
 	}
 	yrange = range( sapply(1:L, function(i) ( err[[i]]$MAPE$indices ) ), na.rm=TRUE )
 	for (i in seq_len(L))
 	{
-		plot(err[[i]]$MAPE$indices, type="l", xlab=ifelse(i==1,"Temps (jours)",""),
-			ylab=ifelse(i==1,"MAPE moyen",""), ylim=yrange, col=cols[i])
+		plot(err[[i]]$MAPE$indices, type="l", xlab=ifelse(i==1,"Time (days)",""),
+			ylab=ifelse(i==1,"Mean MAPE",""), ylim=yrange, col=cols[i])
 		if (i < L)
 			par(new=TRUE)
 	}
@@ -88,7 +88,7 @@ plotPredReal <- function(data, pred, index)
 	prediction = pred$getSerie(index)
 	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="Temps (en heures)", ylab="PM10")
+	plot(measure, type="l", ylim=yrange, xlab="Time (hours)", ylab="PM10")
 	par(new=TRUE)
 	plot(prediction, type="l", col="#0000FF", ylim=yrange, xlab="", ylab="")
 }
@@ -107,7 +107,7 @@ plotSimils <- function(pred, index)
 	if (is.null(weights))
 		stop("plotSimils only works on 'Neighbors' forecasts")
 	par(mar=c(4.7,5,1,1), cex.axis=1.5, cex.lab=1.5)
-	hist(pred$getParams(index)$weights, nclass=20, main="", xlab="Poids", ylab="Effectif")
+	hist(pred$getParams(index)$weights, nclass=20, main="", xlab="Weight", ylab="Count")
 }
 
 #' Functional boxplot
@@ -116,7 +116,6 @@ plotSimils <- function(pred, index)
 #'
 #' @param data Object return by \code{getData}
 #' @param indices integer or date indices to process
-#' @param plot_bivariate Should the bivariate plot appear?
 #'
 #' @export
 plotFbox <- function(data, indices=seq_len(data$getSize()))
@@ -132,7 +131,7 @@ plotFbox <- function(data, indices=seq_len(data$getSize()))
 
 	series_fds = rainbow::fds(seq_len(nrow(series_matrix)), series_matrix)
 	par(mar=c(4.7,5,1,1), cex.axis=1.5, cex.lab=1.5)
-	rainbow::fboxplot(series_fds, "functional", "hdr", xlab="Temps (heures)", ylab="PM10",
+	rainbow::fboxplot(series_fds, "functional", "hdr", xlab="Time (hours)", ylab="PM10",
 		plotlegend=FALSE, lwd=2)
 	rainbow::fboxplot(series_fds, "bivariate", "hdr", plotlegend=FALSE)
 }
@@ -181,7 +180,7 @@ computeFilaments <- function(data, pred, index, limit=60, plot=TRUE)
 		for (i in nn:1)
 		{
 			plot(centered_series[,sorted_dists$ix[i]], ylim=yrange, type="l", col=colors[i],
-				xlab=ifelse(i==1,"Temps (en heures)",""), ylab=ifelse(i==1,"PM10 centré",""))
+				xlab=ifelse(i==1,"Time (hours)",""), ylab=ifelse(i==1,"Centered PM10",""))
 			par(new=TRUE)
 		}
 		# Also plot ref curve, in red
@@ -203,7 +202,7 @@ computeFilaments <- function(data, pred, index, limit=60, plot=TRUE)
 #' @param fil Output of \code{computeFilaments}
 #'
 #' @export
-plotFilamentsBox = function(data, fil, ...)
+plotFilamentsBox = function(data, fil)
 {
 	if (!requireNamespace("rainbow", quietly=TRUE))
 		stop("Functional boxplot requires the rainbow package")
@@ -212,7 +211,7 @@ plotFilamentsBox = function(data, fil, ...)
 		data$getSeries(fil$neighb_indices), data$getSeries(fil$neighb_indices+1) )
 	series_fds = rainbow::fds(seq_len(nrow(series_matrix)), series_matrix)
 	par(mar=c(4.7,5,1,1), cex.axis=1.5, cex.lab=1.5)
-	rainbow::fboxplot(series_fds, "functional", "hdr", xlab="Temps (heures)", ylab="PM10",
+	rainbow::fboxplot(series_fds, "functional", "hdr", xlab="Time (hours)", ylab="PM10",
 		plotlegend=FALSE, lwd=2)
 
 	# "Magic" found at http://stackoverflow.com/questions/13842560/get-xlim-from-a-plot-in-r
@@ -233,7 +232,7 @@ plotFilamentsBox = function(data, fil, ...)
 #' @param fil Output of \code{computeFilaments}
 #'
 #' @export
-plotRelVar = function(data, fil, ...)
+plotRelVar = function(data, fil)
 {
 	ref_var = c( apply(data$getSeries(fil$neighb_indices),1,sd),
 		apply(data$getSeries(fil$neighb_indices+1),1,sd) )
@@ -243,7 +242,7 @@ plotRelVar = function(data, fil, ...)
 	yrange = range(ref_var, global_var)
 	par(mar=c(4.7,5,1,1), cex.axis=1.5, cex.lab=1.5)
 	plot(ref_var, type="l", col=1, lwd=3, ylim=yrange,
-		xlab="Temps (heures)", ylab="Écart-type")
+		xlab="Time (hours)", ylab="Standard deviation")
 	par(new=TRUE)
 	plot(global_var, type="l", col=2, lwd=3, ylim=yrange, xlab="", ylab="")
 	abline(v=24, lty=2, col=colors()[56])