a few adjustments: TODO: bash script to re-reun reports

[talweg.git] / reports / report.gj

diff --git a/reports/report.gj b/reports/report.gj
index b901075..dc4cbd4 100644 (file)
--- a/reports/report.gj
+++ b/reports/report.gj
@@ -31,6 +31,8 @@ data = getData(ts_data, exo_data, input_tz = "Europe/Paris", working_tz="Europe/
 indices_ch = seq(as.Date("2015-01-18"),as.Date("2015-01-24"),"days")
 indices_ep = seq(as.Date("2015-03-15"),as.Date("2015-03-21"),"days")
 indices_np = seq(as.Date("2015-04-26"),as.Date("2015-05-02"),"days")
+
+H = 17 #predict from 8am to 12pm
 % for i in range(3):
 -----
 <h2 style="color:blue;font-size:2em">${list_titles[i]}</h2>
@@ -40,10 +42,10 @@ p_nn_mix = computeForecast(data, ${list_indices[i]}, "Neighbors", "Neighbors", s
 p_az = computeForecast(data, ${list_indices[i]}, "Average", "Zero", horizon=H) #, memory=183)
 p_pz = computeForecast(data, ${list_indices[i]}, "Persistence", "Zero", horizon=H, same_day=TRUE)
 -----r
-e_nn_exo = computeError(data, p_nn_exo)
-e_nn_mix = computeError(data, p_nn_mix)
-e_az = computeError(data, p_az)
-e_pz = computeError(data, p_pz)
+e_nn_exo = computeError(data, p_nn_exo, H)
+e_nn_mix = computeError(data, p_nn_mix, H)
+e_az = computeError(data, p_az, H)
+e_pz = computeError(data, p_pz, H)
 options(repr.plot.width=9, repr.plot.height=7)
 plotError(list(e_nn_mix, e_pz, e_az, e_nn_exo), cols=c(1,2,colors()[258], 4))
 
@@ -94,7 +96,7 @@ plotSimils(p_nn_exo, i_np); title(paste("Weights nn exo day",i_np))
 plotSimils(p_nn_exo, i_p); title(paste("Weights nn exo day",i_p))
 
 plotSimils(p_nn_mix, i_np); title(paste("Weights nn mix day",i_np))
-plotSimils(p_nn_mix, i_p); title(paste("Weights nn mix day",i_p)
+plotSimils(p_nn_mix, i_p); title(paste("Weights nn mix day",i_p))
 
 # - pollué à gauche, + pollué à droite
 -----r