fix plots, fix F_Neighbors on series with NAs

[talweg.git] / reports / report_2017-03-01.7h_average.ipynb

diff --git a/reports/report_2017-03-01.7h_average.ipynb b/reports/report_2017-03-01.7h_average.ipynb
index 61317d0..5789d7d 100644 (file)
--- a/reports/report_2017-03-01.7h_average.ipynb
+++ b/reports/report_2017-03-01.7h_average.ipynb
@@ -19,7 +19,7 @@
    },
    "outputs": [],
    "source": [
-    "ts_data = read.csv(system.file(\"extdata\",\"pm10_mesures_H_loc.csv\",package=\"talweg\"))\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)"
    ]
@@ -268,7 +268,7 @@
    },
    "outputs": [],
    "source": [
-    "par(mfrow=c(2,2))\n",
+    "par(mfrow=c(1,2))\n",
     "plotFilamentsBox(data, f4_ep)\n",
     "plotFilamentsBox(data, f6_ep)\n",
     "\n",
@@ -284,8 +284,8 @@
    "outputs": [],
    "source": [
     "par(mfrow=c(1,2))\n",
-    "plotRelativeVariability(data, f4_ep)\n",
-    "plotRelativeVariability(data, f6_ep)\n",
+    "plotRelVar(data, f4_ep)\n",
+    "plotRelVar(data, f6_ep)\n",
     "\n",
     "#Variabilité globale en rouge ; sur nos 60 voisins (+ lendemains) en noir"
    ]
@@ -406,7 +406,7 @@
    },
    "outputs": [],
    "source": [
-    "par(mfrow=c(2,2))\n",
+    "par(mfrow=c(1,2))\n",
     "plotFilamentsBox(data, f5_np)\n",
     "plotFilamentsBox(data, f6_np)\n",
     "\n",