X-Git-Url: https://git.auder.net/?p=talweg.git;a=blobdiff_plain;f=reports%2Freport_2017-03-01.ipynb;h=acbdfd006c295aa21030615201eb9f739bdecc11;hp=bd2e25efbca02c2b7a209ddf7b21c174dd3a9ee9;hb=1b25210ff672f0fc1abf5e91815bb9926e005e27;hpb=858e4073cc890971fbce3e81572cf4ac57a181f9

diff --git a/reports/report_2017-03-01.ipynb b/reports/report_2017-03-01.ipynb
index bd2e25e..acbdfd0 100644
--- a/reports/report_2017-03-01.ipynb
+++ b/reports/report_2017-03-01.ipynb
@@ -53,7 +53,7 @@
     "indices = seq(as.Date(\"2015-01-18\"),as.Date(\"2015-01-24\"),\"days\")\n",
     "p_ch_nn = getForecast(data,indices,\"Neighbors\",\"Neighbors\",simtype=\"mix\",same_season=FALSE,mix_strategy=\"mult\")\n",
     "p_ch_pz = getForecast(data, indices, \"Persistence\", \"Zero\", same_day=TRUE)\n",
-    "p_ch_az = getForecast(data, indices, \"Average\", \"Zero\", memory=183)\n",
+    "p_ch_az = getForecast(data, indices, \"Average\", \"Zero\") #, memory=183)\n",
     "#p_ch_zz = getForecast(data, indices, \"Zero\", \"Zero\")\n",
     "#p_ch_l = getForecast(data, indices, \"Level\", same_day=FALSE)"
    ]
@@ -181,7 +181,7 @@
     "indices = seq(as.Date(\"2015-03-15\"),as.Date(\"2015-03-21\"),\"days\")\n",
     "p_ep_nn = getForecast(data,indices,\"Neighbors\",\"Neighbors\",simtype=\"mix\",same_season=FALSE,mix_strategy=\"mult\")\n",
     "p_ep_pz = getForecast(data, indices, \"Persistence\", \"Zero\", same_day=TRUE)\n",
-    "p_ep_az = getForecast(data, indices, \"Average\", \"Zero\", memory=183)\n",
+    "p_ep_az = getForecast(data, indices, \"Average\", \"Zero\") #, memory=183)\n",
     "#p_ep_zz = getForecast(data, indices, \"Zero\", \"Zero\")\n",
     "#p_ep_l = getForecast(data, indices, \"Level\", same_day=TRUE)"
    ]
@@ -223,7 +223,9 @@
     "par(mfrow=c(1,2))\n",
     "options(repr.plot.width=9, repr.plot.height=4)\n",
     "plotPredReal(data, p_ep_nn, 4)\n",
-    "plotPredReal(data, p_ep_nn, 6)"
+    "plotPredReal(data, p_ep_nn, 6)\n",
+    "\n",
+    "#Bleu: prévue, noir: réalisée"
    ]
   },
   {
@@ -284,7 +286,7 @@
     "indices = seq(as.Date(\"2015-04-26\"),as.Date(\"2015-05-02\"),\"days\")\n",
     "p_np_nn = getForecast(data,indices,\"Neighbors\",\"Neighbors\",simtype=\"mix\",same_season=FALSE,mix_strategy=\"mult\")\n",
     "p_np_pz = getForecast(data, indices, \"Persistence\", \"Zero\", same_day=FALSE)\n",
-    "p_np_az = getForecast(data, indices, \"Average\", \"Zero\", memory=183)\n",
+    "p_np_az = getForecast(data, indices, \"Average\", \"Zero\") #, memory=183)\n",
     "#p_np_zz = getForecast(data, indices, \"Zero\", \"Zero\")\n",
     "#p_np_l = getForecast(data, indices, \"Level\", same_day=FALSE)"
    ]
@@ -326,7 +328,9 @@
     "par(mfrow=c(1,2))\n",
     "options(repr.plot.width=9, repr.plot.height=4)\n",
     "plotPredReal(data, p_np_nn, 3)\n",
-    "plotPredReal(data, p_np_nn, 6)"
+    "plotPredReal(data, p_np_nn, 6)\n",
+    "\n",
+    "#Bleu: prévue, noir: réalisée"
    ]
   },
   {
@@ -336,6 +340,19 @@
     "Les \"bonnes\" prédictions (à gauche) sont tout de même trop lissées."
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false
+   },
+   "outputs": [],
+   "source": [
+    "par(mfrow=c(1,2))\n",
+    "plotPredReal(data, p_np_az, 3)\n",
+    "plotPredReal(data, p_np_az, 6)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,