X-Git-Url: https://git.auder.net/?p=talweg.git;a=blobdiff_plain;f=reports%2Fyear2015.gj;h=678b962b0f7dd058c707698e761fbdc9617f461a;hp=63f8e418500a62c42132111aa92a3189af601071;hb=HEAD;hpb=f71b975b140342f7ea80275359b7f4f9aa75153a

diff --git a/reports/year2015.gj b/reports/year2015.gj
index 63f8e41..678b962 100644
--- a/reports/year2015.gj
+++ b/reports/year2015.gj
@@ -14,11 +14,11 @@ indices = seq(as.Date("2015-01-01"),as.Date("2015-12-31"),"days")
 -----r
 p1 = computeForecast(data, indices, "Neighbors", "Neighbors",
 	predict_from=P, horizon=H, simtype="mix", local=FALSE)
-p2 = computeForecast(data, indices, "Neighbors", NULL,
+p2 = computeForecast(data, indices, "Neighbors", "Zero",
 	predict_from=P, horizon=H, simtype="none", local=TRUE)
-p3 = computeForecast(data, indices, "Average", "Zero",
+p3 = computeForecast(data, indices, "Average", "LastValue",
 	predict_from=P, horizon=H)
-p4 = computeForecast(data, indices, "Persistence", "Zero",
+p4 = computeForecast(data, indices, "Persistence", "LastValue",
 	predict_from=P, horizon=H, same_day=TRUE)
 -----r
 e1 = computeError(data, p1, P, H)
@@ -26,26 +26,7 @@ e2 = computeError(data, p2, P, H)
 e3 = computeError(data, p3, P, H)
 e4 = computeError(data, p4, P, H)
 options(repr.plot.width=9, repr.plot.height=7)
-plotError(list(e1, e4, e3, e2), cols=c(1,2,colors()[258],4))
+plotError(list(e1, e4, e3, e2), cols=c(1,2,colors()[258],4), agg="month")
 
 # noir: Neighbors non-local (p1), bleu: Neighbors local (p2),
 # vert: moyenne (p3), rouge: persistence (p4)
-
-## TODO: plot modifié, retourner jour par jour et agréger au mois
-
-## TODO: garder éventuellement ça ::
-sum_p23 = e2$abs$indices + e3$abs$indices
-i_np = which.min(sum_p23) #indice de jour "facile"
-i_p = which.max(sum_p23) #indice de jour "difficile"
-% if P == 8:
------r
-options(repr.plot.width=9, repr.plot.height=4)
-par(mfrow=c(1,2))
-
-plotPredReal(data, p1, i_np); title(paste("PredReal p1 day",i_np))
-plotPredReal(data, p1, i_p); title(paste("PredReal p1 day",i_p))
-
-plotPredReal(data, p2, i_np); title(paste("PredReal p2 day",i_np))
-plotPredReal(data, p2, i_p); title(paste("PredReal p2 day",i_p))
-
-# Bleu : prévue ; noir : réalisée (confondues jusqu'à predict_from-1)