X-Git-Url: https://git.auder.net/?p=talweg.git;a=blobdiff_plain;f=reports%2Freport_2017-03-01.ipynb;h=3e58706ff660c49bb9d11d55ea490395e7a41fdd;hp=22e7dc4cde4cb58b1efe3d79a8106ac499ab4d8f;hb=e030a6e31232332b73187eda25870e843152c174;hpb=31f7d913d4a99d0a4db9bcfe40e31cebf90b22e6

diff --git a/reports/report_2017-03-01.ipynb b/reports/report_2017-03-01.ipynb
index 22e7dc4..3e58706 100644
--- a/reports/report_2017-03-01.ipynb
+++ b/reports/report_2017-03-01.ipynb
@@ -50,12 +50,11 @@
    },
    "outputs": [],
    "source": [
-    "p_ch_nn = getForecast(data, seq(as.Date(\"2015-01-18\"),as.Date(\"2015-01-24\"),\"days\"), Inf, 17,\n",
-    "                   \"Neighbors\", \"Neighbors\", simtype=\"mix\", same_season=FALSE, mix_strategy=\"mult\")\n",
-    "p_ch_pz = getForecast(data, seq(as.Date(\"2015-01-18\"),as.Date(\"2015-01-24\"),\"days\"), Inf, 17,\n",
-    "                   \"Persistence\", \"Zero\")\n",
-    "p_ch_az = getForecast(data, seq(as.Date(\"2015-01-18\"),as.Date(\"2015-01-24\"),\"days\"), Inf, 17,\n",
-    "                   \"Average\", \"Zero\")"
+    "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\")\n",
+    "p_ch_az = getForecast(data, indices, \"Average\", \"Zero\")\n",
+    "p_ch_zz = getForecast(data, indices, \"Zero\", \"Zero\")"
    ]
   },
   {
@@ -66,9 +65,9 @@
    },
    "outputs": [],
    "source": [
-    "e_ch_nn = getError(data, p_ch_nn, 17)\n",
-    "e_ch_pz = getError(data, p_ch_pz, 17)\n",
-    "e_ch_az = getError(data, p_ch_az, 17)\n",
+    "e_ch_nn = getError(data, p_ch_nn)\n",
+    "e_ch_pz = getError(data, p_ch_pz)\n",
+    "e_ch_az = getError(data, p_ch_az)\n",
     "options(repr.plot.width=9, repr.plot.height=6)\n",
     "plotError(list(e_ch_nn, e_ch_pz, e_ch_az), cols=c(1,2,colors()[258]))\n",
     "\n",
@@ -176,12 +175,12 @@
    },
    "outputs": [],
    "source": [
-    "p_ep_nn = getForecast(data, seq(as.Date(\"2015-03-15\"),as.Date(\"2015-03-21\"),\"days\"), Inf, 17,\n",
-    "                   \"Neighbors\", \"Neighbors\", simtype=\"mix\", same_season=FALSE, mix_strategy=\"mult\")\n",
-    "p_ep_pz = getForecast(data, seq(as.Date(\"2015-03-15\"),as.Date(\"2015-03-21\"),\"days\"), Inf, 17,\n",
-    "                   \"Persistence\", \"Zero\")\n",
-    "p_ep_az = getForecast(data, seq(as.Date(\"2015-03-15\"),as.Date(\"2015-03-21\"),\"days\"), Inf, 17,\n",
-    "                   \"Average\", \"Zero\")"
+    "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\")\n",
+    "p_ep_az = getForecast(data, indices, \"Average\", \"Zero\")\n",
+    "p_ep_zz = getForecast(data, indices, \"Zero\", \"Zero\")\n",
+    "p_ep_lz = getForecast(data, indices, \"Level\", \"Zero\")"
    ]
   },
   {
@@ -192,9 +191,9 @@
    },
    "outputs": [],
    "source": [
-    "e_ep_nn = getError(data, p_ep_nn, 17)\n",
-    "e_ep_pz = getError(data, p_ep_pz, 17)\n",
-    "e_ep_az = getError(data, p_ep_az, 17)\n",
+    "e_ep_nn = getError(data, p_ep_nn)\n",
+    "e_ep_pz = getError(data, p_ep_pz)\n",
+    "e_ep_az = getError(data, p_ep_az)\n",
     "options(repr.plot.width=9, repr.plot.height=6)\n",
     "plotError(list(e_ep_nn, e_ep_pz, e_ep_az), cols=c(1,2,colors()[258]))\n",
     "\n",
@@ -277,12 +276,12 @@
    },
    "outputs": [],
    "source": [
-    "p_np_nn = getForecast(data, seq(as.Date(\"2015-04-26\"),as.Date(\"2015-05-02\"),\"days\"), Inf, 17,\n",
-    "                   \"Neighbors\", \"Neighbors\", simtype=\"mix\", same_season=FALSE, mix_strategy=\"mult\")\n",
-    "p_np_pz = getForecast(data, seq(as.Date(\"2015-04-26\"),as.Date(\"2015-05-02\"),\"days\"), Inf, 17,\n",
-    "                   \"Persistence\", \"Zero\")\n",
-    "p_np_az = getForecast(data, seq(as.Date(\"2015-04-26\"),as.Date(\"2015-05-02\"),\"days\"), Inf, 17,\n",
-    "                   \"Average\", \"Zero\")"
+    "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\")\n",
+    "p_np_az = getForecast(data, indices, \"Average\", \"Zero\")\n",
+    "p_np_zz = getForecast(data, indices, \"Zero\", \"Zero\")\n",
+    "p_np_lz = getForecast(data, indices, \"Level\", \"Zero\")"
    ]
   },
   {
@@ -293,9 +292,9 @@
    },
    "outputs": [],
    "source": [
-    "e_np_nn = getError(data, p_np_nn, 17)\n",
-    "e_np_pz = getError(data, p_np_pz, 17)\n",
-    "e_np_az = getError(data, p_np_az, 17)\n",
+    "e_np_nn = getError(data, p_np_nn)\n",
+    "e_np_pz = getError(data, p_np_pz)\n",
+    "e_np_az = getError(data, p_np_az)\n",
     "options(repr.plot.width=9, repr.plot.height=6)\n",
     "plotError(list(e_np_nn, e_np_pz, e_np_az), cols=c(1,2,colors()[258]))\n",
     "\n",