X-Git-Url: https://git.auder.net/?p=talweg.git;a=blobdiff_plain;f=reports%2Freport.ipynb;h=74d6880f31f696aabe484b08c93a80d49d30d76f;hp=bdf1723b33efbe49439b8daf77e265ed59adf487;hb=55639673dd1510a02671c4646813ae346cdca4d6;hpb=d444b27afb654f1aa435a0b237b91f8e11c37a6b

diff --git a/reports/report.ipynb b/reports/report.ipynb
index bdf1723..74d6880 100644
--- a/reports/report.ipynb
+++ b/reports/report.ipynb
@@ -29,22 +29,19 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "library(talweg)\n",
     "\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=7)\n",
+    "data = getData(ts_data, exo_data, input_tz = \"Europe/Paris\", working_tz=\"Europe/Paris\",\n",
+    "\tpredict_at=7) #predict from P+1 to P+H included\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\")\n",
-    "\n",
-    "H = 3 #predict from 2pm to 4pm"
+    "indices_np = seq(as.Date(\"2015-04-26\"),as.Date(\"2015-05-02\"),\"days\")\n"
    ]
   },
   {
@@ -59,30 +56,29 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
-    "p_nn_exo = computeForecast(data, indices_ch, \"Neighbors\", \"Neighbors\", simtype=\"exo\", horizon=H)\n",
-    "p_nn_mix = computeForecast(data, indices_ch, \"Neighbors\", \"Neighbors\", simtype=\"mix\", horizon=H)\n",
-    "p_az = computeForecast(data, indices_ch, \"Average\", \"Zero\", horizon=H) #, memory=183)\n",
-    "p_pz = computeForecast(data, indices_ch, \"Persistence\", \"Zero\", horizon=H, same_day=TRUE)"
+    "p_nn_exo = computeForecast(data, indices_ch, \"Neighbors\", \"Neighbors\",\n",
+    "\thorizon=3, simtype=\"exo\")\n",
+    "p_nn_mix = computeForecast(data, indices_ch, \"Neighbors\", \"Neighbors\",\n",
+    "\thorizon=3, simtype=\"mix\")\n",
+    "p_az = computeForecast(data, indices_ch, \"Average\", \"Zero\",\n",
+    "\thorizon=3)\n",
+    "p_pz = computeForecast(data, indices_ch, \"Persistence\", \"Zero\",\n",
+    "\thorizon=3, same_day=TRUE)"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
-    "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",
+    "e_nn_exo = computeError(data, p_nn_exo, 3)\n",
+    "e_nn_mix = computeError(data, p_nn_mix, 3)\n",
+    "e_az = computeError(data, p_az, 3)\n",
+    "e_pz = computeError(data, p_pz, 3)\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",
@@ -95,9 +91,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "options(repr.plot.width=9, repr.plot.height=4)\n",
@@ -118,9 +112,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "par(mfrow=c(1,2))\n",
@@ -134,9 +126,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "par(mfrow=c(1,2))\n",
@@ -150,9 +140,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "par(mfrow=c(1,2))\n",
@@ -168,9 +156,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "par(mfrow=c(1,2))\n",
@@ -186,9 +172,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "# Fenêtres sélectionnées dans ]0,10] / endo à gauche, exo à droite\n",
@@ -211,29 +195,29 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
-    "p_nn_exo = computeForecast(data, indices_ep, \"Neighbors\", \"Neighbors\", simtype=\"exo\", horizon=H)\n",
-    "p_nn_mix = computeForecast(data, indices_ep, \"Neighbors\", \"Neighbors\", simtype=\"mix\", horizon=H)\n",
-    "p_az = computeForecast(data, indices_ep, \"Average\", \"Zero\", horizon=H) #, memory=183)\n",
-    "p_pz = computeForecast(data, indices_ep, \"Persistence\", \"Zero\", horizon=H, same_day=TRUE)"
+    "p_nn_exo = computeForecast(data, indices_ep, \"Neighbors\", \"Neighbors\",\n",
+    "\thorizon=3, simtype=\"exo\")\n",
+    "p_nn_mix = computeForecast(data, indices_ep, \"Neighbors\", \"Neighbors\",\n",
+    "\thorizon=3, simtype=\"mix\")\n",
+    "p_az = computeForecast(data, indices_ep, \"Average\", \"Zero\",\n",
+    "\thorizon=3)\n",
+    "p_pz = computeForecast(data, indices_ep, \"Persistence\", \"Zero\",\n",
+    "\thorizon=3, same_day=TRUE)"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
-    "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",
+    "e_nn_exo = computeError(data, p_nn_exo, 3)\n",
+    "e_nn_mix = computeError(data, p_nn_mix, 3)\n",
+    "e_az = computeError(data, p_az, 3)\n",
+    "e_pz = computeError(data, p_pz, 3)\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",
@@ -246,9 +230,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "options(repr.plot.width=9, repr.plot.height=4)\n",
@@ -269,9 +251,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "par(mfrow=c(1,2))\n",
@@ -285,9 +265,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "par(mfrow=c(1,2))\n",
@@ -301,9 +279,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "par(mfrow=c(1,2))\n",
@@ -319,9 +295,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "par(mfrow=c(1,2))\n",
@@ -337,9 +311,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "# Fenêtres sélectionnées dans ]0,10] / endo à gauche, exo à droite\n",
@@ -362,29 +334,29 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
-    "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=FALSE)"
+    "p_nn_exo = computeForecast(data, indices_np, \"Neighbors\", \"Neighbors\",\n",
+    "\thorizon=3, simtype=\"exo\")\n",
+    "p_nn_mix = computeForecast(data, indices_np, \"Neighbors\", \"Neighbors\",\n",
+    "\thorizon=3, simtype=\"mix\")\n",
+    "p_az = computeForecast(data, indices_np, \"Average\", \"Zero\",\n",
+    "\thorizon=3)\n",
+    "p_pz = computeForecast(data, indices_np, \"Persistence\", \"Zero\",\n",
+    "\thorizon=3, same_day=FALSE)"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
-    "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",
+    "e_nn_exo = computeError(data, p_nn_exo, 3)\n",
+    "e_nn_mix = computeError(data, p_nn_mix, 3)\n",
+    "e_az = computeError(data, p_az, 3)\n",
+    "e_pz = computeError(data, p_pz, 3)\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",
@@ -397,9 +369,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "options(repr.plot.width=9, repr.plot.height=4)\n",
@@ -420,9 +390,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "par(mfrow=c(1,2))\n",
@@ -436,9 +404,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "par(mfrow=c(1,2))\n",
@@ -452,9 +418,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "par(mfrow=c(1,2))\n",
@@ -470,9 +434,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "par(mfrow=c(1,2))\n",
@@ -488,9 +450,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "# Fenêtres sélectionnées dans ]0,10] / endo à gauche, exo à droite\n",