X-Git-Url: https://git.auder.net/?p=talweg.git;a=blobdiff_plain;f=pkg%2FR%2Fplot.R;fp=pkg%2FR%2Fplot.R;h=8675c620d568ed37a6fbf936e461fcab96a5e489;hp=2488d81548202fa9af8e8e3e2a1f23f006914694;hb=9b9bb2d490e356ff0393aec66b137cff0a64803d;hpb=882ae735725861e5a0f61b83556265dd367452dd

diff --git a/pkg/R/plot.R b/pkg/R/plot.R
index 2488d81..8675c62 100644
--- a/pkg/R/plot.R
+++ b/pkg/R/plot.R
@@ -30,40 +30,24 @@ plotError <- function(err, cols=seq_along(err))
 {
 	if (!is.null(err$abs))
 		err = list(err)
-	par(mfrow=c(2,2), mar=c(4.7,5,1,1), cex.axis=1.5, cex.lab=1.5, lwd=2)
+	par(mfrow=c(2,2), mar=c(4.7,5,1,1), cex.axis=1.5, cex.lab=1.5, lty=1)
 	L = length(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,"Time (hours)",""),
-			ylab=ifelse(i==1,"Mean |y - y_hat|",""), ylim=yrange, col=cols[i])
-		if (i < L)
-			par(new=TRUE)
-	}
+	matplot( sapply( seq_len(L), function(i) err[[i]]$abs$day ), type="l",
+		xlab="Time (hours)", ylab="Mean |y - y_hat|", ylim=yrange, col=cols, lwd=2 )
+
 	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,"Time (days)",""),
-			ylab=ifelse(i==1,"Mean |y - y_hat|",""), ylim=yrange, col=cols[i])
-		if (i < L)
-			par(new=TRUE)
-	}
+	matplot( sapply( seq_len(L), function(i) err[[i]]$abs$indices ), type="l",
+		xlab="Time (days)", ylab="Mean |y - y_hat|", ylim=yrange, col=cols, lwd=2 )
+
 	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,"Time (hours)",""),
-			ylab=ifelse(i==1,"Mean MAPE",""), ylim=yrange, col=cols[i])
-		if (i < L)
-			par(new=TRUE)
-	}
+	matplot( sapply( seq_len(L), function(i) err[[i]]$MAPE$day ), type="l",
+		xlab="Time (hours)", ylab="Mean MAPE", ylim=yrange, col=cols, lwd=2 )
+
 	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,"Time (days)",""),
-			ylab=ifelse(i==1,"Mean MAPE",""), ylim=yrange, col=cols[i])
-		if (i < L)
-			par(new=TRUE)
-	}
+	matplot( sapply( seq_len(L), function(i) err[[i]]$MAPE$indices ), type="l",
+		xlab="Time (days)", ylab="Mean MAPE", ylim=yrange, col=cols, lwd=2 )
 }
 
 #' Plot measured / predicted
@@ -77,7 +61,13 @@ plotError <- function(err, cols=seq_along(err))
 plotPredReal <- function(data, pred, index)
 {
 	prediction = pred$getForecast(index)
-	measure = data$getSerie( pred$getIndexInData(index) )[1:length(prediction)]
+	measure = data$getSerie( pred$getIndexInData(index) )[1:length(pred$getForecast(1))]
+
+	# Remove the common part, where prediction == measure
+	dot_mark <- ifelse(prediction[1]==measure[1], which.max(prediction==measure), 0)
+	prediction = prediction[(dot_mark+1):length(prediction)]
+	measure = measure[(dot_mark+1):length(measure)]
+
 	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")
@@ -98,8 +88,11 @@ plotSimils <- function(pred, index)
 	weights = pred$getParams(index)$weights
 	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="Weight", ylab="Count")
+	par(mfrow=c(1,2), mar=c(4.7,5,1,1), cex.axis=1.5, cex.lab=1.5)
+	small_weights = weights[ weights < 1/length(weights) ]
+	large_weights = weights[ weights >= 1/length(weights) ]
+	hist(small_weights, nclass=25, main="", xlab="Weight < 1/N", ylab="Count")
+	hist(large_weights, nclass=25, main="", xlab="Weight >= 1/N", ylab="Count")
 }
 
 #' Functional boxplot
@@ -137,7 +130,6 @@ plotFbox <- function(data, indices=seq_len(data$getSize()))
 #' @param index Index in forecast (integer or date)
 #' @param limit Number of neighbors to consider
 #' @param plot Should the result be plotted?
-#' @param predict_from First prediction instant
 #'
 #' @return A list with
 #' \itemize{
@@ -147,18 +139,24 @@ plotFbox <- function(data, indices=seq_len(data$getSize()))
 #' }
 #'
 #' @export
-computeFilaments <- function(data, pred, index, predict_from, limit=60, plot=TRUE)
+computeFilaments <- function(data, pred, index, limit=60, plot=TRUE)
 {
-	if (is.null(pred$getParams(index)$weights) || is.na(pred$getParams(index)$weights[1]))
+	weights <- pred$getParams(index)$weights
+	if (is.null(weights) || is.na(pred$getParams(index)$weights[1]))
 		stop("computeFilaments requires a serie without NAs")
 
-	# Compute colors for each neighbor (from darkest to lightest)
-	sorted_dists = sort(-log(pred$getParams(index)$weights), index.return=TRUE)
-	nn = min(limit, length(sorted_dists$x))
-	min_dist = min(sorted_dists$x[1:nn])
-	max_dist = max(sorted_dists$x[1:nn])
-	color_values = floor(19.5*(sorted_dists$x[1:nn]-min_dist)/(max_dist-min_dist)) + 1
-	colors = gray.colors(20,0.1,0.9)[color_values] #TODO: 20 == magic number
+	nn <- min(limit, length(weights))
+	sorted_dists = sort(-log(weights), index.return=TRUE)
+	# Compute colors for each neighbor (from darkest to lightest), if weights differ
+	if ( any( weights != weights[1] ) )
+	{
+		min_dist = min(sorted_dists$x[1:nn])
+		max_dist = max(sorted_dists$x[1:nn])
+		color_values = floor(19.5*(sorted_dists$x[1:nn]-min_dist)/(max_dist-min_dist)) + 1
+		colors = gray.colors(20,0.1,0.9)[color_values] #TODO: 20 == magic number
+	}
+	else
+		colors <- rep(colors()[17], length(weights))
 
 	if (plot)
 	{
@@ -179,7 +177,9 @@ computeFilaments <- function(data, pred, index, predict_from, limit=60, plot=TRU
 		}
 		# Also plot ref curve, in red
 		plot(ref_serie, ylim=yrange, type="l", col="#FF0000", xlab="", ylab="")
-		abline(v=24+predict_from-0.5, lty=2, col=colors()[56], lwd=1)
+		dot_mark <- 0.5 + which.max( pred$getForecast(1) ==
+			data$getSerie( pred$getIndexInData(1) )[1:length(pred$getForecast(1))] )
+		abline(v=24+dot_mark, lty=2, col=colors()[56], lwd=1)
 	}
 
 	list(
@@ -194,6 +194,7 @@ computeFilaments <- function(data, pred, index, predict_from, limit=60, plot=TRU
 #'
 #' @inheritParams computeError
 #' @param fil Output of \code{computeFilaments}
+#' @param predict_from First predicted time step
 #'
 #' @export
 plotFilamentsBox = function(data, fil, predict_from)
@@ -213,7 +214,7 @@ plotFilamentsBox = function(data, fil, predict_from)
 	usr <- par("usr")
 	yr <- (usr[4] - usr[3]) / 27
 	par(new=TRUE)
-	plot(c(data$getSerie(fil$index),data$getSerie(fil$index+1)), type="l", lwd=2, lty=2,
+	plot(c(data$getSerie(fil$index-1),data$getSerie(fil$index)), type="l", lwd=2, lty=2,
 		ylim=c(usr[3] + yr, usr[4] - yr), xlab="", ylab="")
 	abline(v=24+predict_from-0.5, lty=2, col=colors()[56])
 }