diff --git a/notebooks/Dashboard.ipynb b/notebooks/Dashboard.ipynb index 81a9f0ea39a8c8382fa5dcb2ae5747d74fa95cd3..ed4cb56a3c22fda69c6595762e4f85893ab3eb57 100644 --- a/notebooks/Dashboard.ipynb +++ b/notebooks/Dashboard.ipynb @@ -188,7 +188,7 @@ "outputs": [], "source": [ "# select countries over a certain per capita case threshold\n", - "per_capita_thresh = 1200\n", + "per_capita_thresh = 2100\n", "countries_over_thresh_per_capita = latest_df[latest_df.positive_100k > per_capita_thresh].country_label\n", "countries_over_thresh_per_capita = [c for c in countries_over_thresh_per_capita if c not in set(['Andorra', 'Iceland', 'San Marino'])]\n", "\n", diff --git a/notebooks/covid-19-ecdc.ipynb b/notebooks/covid-19-ecdc.ipynb index 893b6835a1af27af6a1220a787f17a6da834c02d..f5f731bfb0739c7f04b4452b79544d78993254d3 100644 --- a/notebooks/covid-19-ecdc.ipynb +++ b/notebooks/covid-19-ecdc.ipynb @@ -81,7 +81,7 @@ "metadata": {}, "outputs": [], "source": [ - "nthresh=300000\n", + "nthresh=500000\n", "country_max_ser = df.set_index(['country_label', 'date'])['positive'].groupby(level='country_label').max()\n", "countries_over_thresh = country_max_ser[country_max_ser>nthresh].index\n", "countries_over_thresh = [c for c in countries_over_thresh if c not in set(['Andorra', 'Iceland', 'San Marino'])]\n", diff --git a/notebooks/covid-19-us-nyt.ipynb b/notebooks/covid-19-us-nyt.ipynb index ff37ece54901b14cefe5b367dbe3952489551c90..1f49d9b8cd29676cc676f67f9ec8b5346e4e048c 100644 --- a/notebooks/covid-19-us-nyt.ipynb +++ b/notebooks/covid-19-us-nyt.ipynb @@ -200,7 +200,7 @@ " pos_day=(12, 20000), \n", " pos_3days=(40,20000),\n", " pos_week=(44,100),\n", - " max_days=150, \n", + " max_days=250, \n", " max_case=50000,\n", " start_case=10\n", ")\n", diff --git a/notebooks/openzh-covid-19.ipynb b/notebooks/openzh-covid-19.ipynb index 97607cc8d780de22883d7cf0f2ee1817fcf5b4db..4d4797b61a5234d2dc2b07cafd0ca32280e07e5a 100644 --- a/notebooks/openzh-covid-19.ipynb +++ b/notebooks/openzh-covid-19.ipynb @@ -93,7 +93,16 @@ "metadata": {}, "outputs": [], "source": [ - "base = alt.Chart(df)\n", + "startdate = \"2020-08-01\"" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "base = alt.Chart(df[df['date'] > startdate])\n", "base.configure_header(titleFontSize=25)\n", "base.configure_axis(labelFontSize=15, titleFontSize=15)\n", "\n", @@ -139,7 +148,7 @@ "metadata": {}, "outputs": [], "source": [ - "base = alt.Chart(df)\n", + "base = alt.Chart(df[df['date'] > startdate])\n", "base.configure_header(titleFontSize=25)\n", "base.configure_axis(labelFontSize=15, titleFontSize=15)\n", "\n", @@ -178,16 +187,16 @@ "metadata": {}, "outputs": [], "source": [ - "since_100th_case = helper.make_since_df(df, 'positive', 'canton')\n", + "since_100th_case = helper.make_since_df(df, 'positive', 'canton', start_case=1000)\n", "\n", - "base = alt.Chart(since_100th_case, title=\"Switzerland: total cases since 100th case\").encode(alt.Y(scale=alt.Scale(type='log')))\n", + "base = alt.Chart(since_100th_case, title=\"Switzerland: total cases since 1000th case\").encode(alt.Y(scale=alt.Scale(type='log')))\n", "\n", "lineChart = plotting.make_region_since_chart(\n", " base, \n", " 'positive', \n", " 'sinceDay0', \n", " 'canton', \n", - " 'Days since 100th case',\n", + " 'Days since 1000th case',\n", " 'Cumulative positive cases',\n", " 'Cases',\n", " 'Canton'\n", @@ -196,9 +205,7 @@ " height=450\n", ")\n", "\n", - "rule_chart = plotting.make_rule_chart(max_days=max(since_100th_case['sinceDay0']), pos_day=(9,5000), pos_3days=(19,8000))\n", - "\n", - "lineChart + rule_chart" + "lineChart " ] }, {