after merge

[talweg.git] / reports / report.gj

diff --git a/reports/report.gj b/reports/report.gj
index dc4cbd4..3932639 100644 (file)
--- a/reports/report.gj
+++ b/reports/report.gj
@@ -24,23 +24,30 @@ list_indices = ['indices_ch', 'indices_ep', 'indices_np']
 -----r
 library(talweg)
 
+P = ${P} #instant de prévision
+H = ${H} #horizon (en heures)
+
 ts_data = read.csv(system.file("extdata","pm10_mesures_H_loc_report.csv",package="talweg"))
 exo_data = read.csv(system.file("extdata","meteo_extra_noNAs.csv",package="talweg"))
-data = getData(ts_data, exo_data, input_tz = "Europe/Paris", working_tz="Europe/Paris", predict_at=13)
+data = getData(ts_data, exo_data, input_tz = "Europe/Paris", working_tz="Europe/Paris",
+       predict_at=P) #predict from P+1 to P+H included
 
 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>
 -----r
-p_nn_exo = computeForecast(data, ${list_indices[i]}, "Neighbors", "Neighbors", simtype="exo", horizon=H)
-p_nn_mix = computeForecast(data, ${list_indices[i]}, "Neighbors", "Neighbors", simtype="mix", horizon=H)
-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)
+p_nn_exo = computeForecast(data, ${list_indices[i]}, "Neighbors", "Neighbors",
+       horizon=H, simtype="exo")
+p_nn_mix = computeForecast(data, ${list_indices[i]}, "Neighbors", "Neighbors",
+       horizon=H, simtype="mix")
+p_az = computeForecast(data, ${list_indices[i]}, "Average", "Zero",
+       horizon=H)
+p_pz = computeForecast(data, ${list_indices[i]}, "Persistence", "Zero",
+       horizon=${H}, same_day=${'TRUE' if loop.index < 2 else 'FALSE'})
 -----r
 e_nn_exo = computeError(data, p_nn_exo, H)
 e_nn_mix = computeError(data, p_nn_mix, H)