X-Git-Url: https://git.auder.net/?p=talweg.git;a=blobdiff_plain;f=reports%2Freport.ipynb;h=bdf1723b33efbe49439b8daf77e265ed59adf487;hp=05f51de7d0b28c376070dc2e999ab043b7486b59;hb=d4841a3f15f94ce0520559aed9466c9c3f259d68;hpb=fa5b7bfc79eeffcb6e1f7b254c2d6786ba5cdbe7

diff --git a/reports/report.ipynb b/reports/report.ipynb
index 05f51de..bdf1723 100644
--- a/reports/report.ipynb
+++ b/reports/report.ipynb
@@ -38,11 +38,13 @@
     "\n",
     "ts_data = read.csv(system.file(\"extdata\",\"pm10_mesures_H_loc_report.csv\",package=\"talweg\"))\n",
     "exo_data = read.csv(system.file(\"extdata\",\"meteo_extra_noNAs.csv\",package=\"talweg\"))\n",
-    "data = getData(ts_data, exo_data, input_tz = \"Europe/Paris\", working_tz=\"Europe/Paris\", predict_at=13)\n",
+    "data = getData(ts_data, exo_data, input_tz = \"Europe/Paris\", working_tz=\"Europe/Paris\", predict_at=7)\n",
     "\n",
     "indices_ch = seq(as.Date(\"2015-01-18\"),as.Date(\"2015-01-24\"),\"days\")\n",
     "indices_ep = seq(as.Date(\"2015-03-15\"),as.Date(\"2015-03-21\"),\"days\")\n",
-    "indices_np = seq(as.Date(\"2015-04-26\"),as.Date(\"2015-05-02\"),\"days\")"
+    "indices_np = seq(as.Date(\"2015-04-26\"),as.Date(\"2015-05-02\"),\"days\")\n",
+    "\n",
+    "H = 3 #predict from 2pm to 4pm"
    ]
   },
   {
@@ -76,10 +78,11 @@
    },
    "outputs": [],
    "source": [
-    "e_nn_exo = computeError(data, p_nn_exo)\n",
-    "e_nn_mix = computeError(data, p_nn_mix)\n",
-    "e_az = computeError(data, p_az)\n",
-    "e_pz = computeError(data, p_pz)\n",
+    "e_nn_exo = computeError(data, p_nn_exo, H)\n",
+    "e_nn_mix = computeError(data, p_nn_mix, H)\n",
+    "e_az = computeError(data, p_az, H)\n",
+    "e_pz = computeError(data, p_pz, H)\n",
+    "\n",
     "options(repr.plot.width=9, repr.plot.height=7)\n",
     "plotError(list(e_nn_mix, e_pz, e_az, e_nn_exo), cols=c(1,2,colors()[258], 4))\n",
     "\n",
@@ -175,7 +178,7 @@
     "plotSimils(p_nn_exo, i_p); title(paste(\"Weights nn exo day\",i_p))\n",
     "\n",
     "plotSimils(p_nn_mix, i_np); title(paste(\"Weights nn mix day\",i_np))\n",
-    "plotSimils(p_nn_mix, i_p); title(paste(\"Weights nn mix day\",i_p)\n",
+    "plotSimils(p_nn_mix, i_p); title(paste(\"Weights nn mix day\",i_p))\n",
     "\n",
     "# - pollué à gauche, + pollué à droite"
    ]
@@ -227,10 +230,10 @@
    },
    "outputs": [],
    "source": [
-    "e_nn_exo = computeError(data, p_nn_exo)\n",
-    "e_nn_mix = computeError(data, p_nn_mix)\n",
-    "e_az = computeError(data, p_az)\n",
-    "e_pz = computeError(data, p_pz)\n",
+    "e_nn_exo = computeError(data, p_nn_exo, H)\n",
+    "e_nn_mix = computeError(data, p_nn_mix, H)\n",
+    "e_az = computeError(data, p_az, H)\n",
+    "e_pz = computeError(data, p_pz, H)\n",
     "options(repr.plot.width=9, repr.plot.height=7)\n",
     "plotError(list(e_nn_mix, e_pz, e_az, e_nn_exo), cols=c(1,2,colors()[258], 4))\n",
     "\n",
@@ -326,7 +329,7 @@
     "plotSimils(p_nn_exo, i_p); title(paste(\"Weights nn exo day\",i_p))\n",
     "\n",
     "plotSimils(p_nn_mix, i_np); title(paste(\"Weights nn mix day\",i_np))\n",
-    "plotSimils(p_nn_mix, i_p); title(paste(\"Weights nn mix day\",i_p)\n",
+    "plotSimils(p_nn_mix, i_p); title(paste(\"Weights nn mix day\",i_p))\n",
     "\n",
     "# - pollué à gauche, + pollué à droite"
    ]
@@ -367,7 +370,7 @@
     "p_nn_exo = computeForecast(data, indices_np, \"Neighbors\", \"Neighbors\", simtype=\"exo\", horizon=H)\n",
     "p_nn_mix = computeForecast(data, indices_np, \"Neighbors\", \"Neighbors\", simtype=\"mix\", horizon=H)\n",
     "p_az = computeForecast(data, indices_np, \"Average\", \"Zero\", horizon=H) #, memory=183)\n",
-    "p_pz = computeForecast(data, indices_np, \"Persistence\", \"Zero\", horizon=H, same_day=TRUE)"
+    "p_pz = computeForecast(data, indices_np, \"Persistence\", \"Zero\", horizon=H, same_day=FALSE)"
    ]
   },
   {
@@ -378,10 +381,10 @@
    },
    "outputs": [],
    "source": [
-    "e_nn_exo = computeError(data, p_nn_exo)\n",
-    "e_nn_mix = computeError(data, p_nn_mix)\n",
-    "e_az = computeError(data, p_az)\n",
-    "e_pz = computeError(data, p_pz)\n",
+    "e_nn_exo = computeError(data, p_nn_exo, H)\n",
+    "e_nn_mix = computeError(data, p_nn_mix, H)\n",
+    "e_az = computeError(data, p_az, H)\n",
+    "e_pz = computeError(data, p_pz, H)\n",
     "options(repr.plot.width=9, repr.plot.height=7)\n",
     "plotError(list(e_nn_mix, e_pz, e_az, e_nn_exo), cols=c(1,2,colors()[258], 4))\n",
     "\n",
@@ -477,7 +480,7 @@
     "plotSimils(p_nn_exo, i_p); title(paste(\"Weights nn exo day\",i_p))\n",
     "\n",
     "plotSimils(p_nn_mix, i_np); title(paste(\"Weights nn mix day\",i_np))\n",
-    "plotSimils(p_nn_mix, i_p); title(paste(\"Weights nn mix day\",i_p)\n",
+    "plotSimils(p_nn_mix, i_p); title(paste(\"Weights nn mix day\",i_p))\n",
     "\n",
     "# - pollué à gauche, + pollué à droite"
    ]