X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=uk_deaths_import.md;h=612783c9d629b396cdf8d7372c009d0cd503b70f;hb=15eaad40c32fd6ac6ce6457451f4933fb45890b0;hp=e775661c8803ddaf2c8da3a68ff001d1b7c4e324;hpb=5afedd66506be7575034ae6deebcfaa7c2ced978;p=covid19.git

diff --git a/uk_deaths_import.md b/uk_deaths_import.md
index e775661..612783c 100644
--- a/uk_deaths_import.md
+++ b/uk_deaths_import.md
@@ -5,8 +5,8 @@ jupyter:
     text_representation:
       extension: .md
       format_name: markdown
-      format_version: '1.2'
-      jupytext_version: 1.9.1
+      format_version: '1.3'
+      jupytext_version: 1.10.2
   kernelspec:
     display_name: Python 3
     language: python
@@ -53,25 +53,36 @@ engine = create_engine(connection_string)
 ```
 
 ```python Collapsed="false"
-england_wales_filename = 'uk-deaths-data/copyofpublishedweek042021.xlsx'
+england_wales_filename = 'uk-deaths-data/publishedweek052021.xlsx'
 ```
 
 ```python Collapsed="false"
-scotland_filename = 'uk-deaths-data/Scottish Government COVID-19 data (10 February 2021).xlsx'
+scotland_filename = 'uk-deaths-data/Scottish Government COVID-19 data (15 February 2021).xlsx'
 ```
 
 ```python
 n_ireland_filename = 'uk-deaths-data/Weekly_Deaths_0.xlsx'
 ```
 
+```python Collapsed="false"
+# eng_xls = pd.read_excel(england_wales_filename, 
+#                         sheet_name="Weekly figures 2021",
+#                         skiprows=[0, 1, 2, 3],
+#                         skipfooter=11,
+#                         header=0,
+#                         index_col=[1]
+#                        ).iloc[:99].T
+# eng_xls
+```
+
 ```python Collapsed="false"
 eng_xls = pd.read_excel(england_wales_filename, 
                         sheet_name="Weekly figures 2021",
                         skiprows=[0, 1, 2, 3],
-                        skipfooter=11,
+                        skipfooter=10,
                         header=0,
                         index_col=[1]
-                       ).iloc[:91].T
+                       ).T
 eng_xls
 ```
 
@@ -415,7 +426,7 @@ def create_and_save_radar_plot(dataset, title_string, filename_suffix):
     ax.set_xticklabels(dataset.index)
     plt.legend()
     plt.title(f"Deaths by week over years, {title_string}")
-    plt.savefig(f'deaths-radar-2021{filename_suffix}.png')
+    plt.savefig(f'deaths_radar_2021{filename_suffix}.png')
     plt.show()
 ```
 
@@ -469,19 +480,19 @@ create_and_save_radar_plot(deaths, 'all UK', '')
 <!-- #endregion -->
 
 ```python
-create_and_save_radar_plot(deaths_e, 'England', '-england')
+create_and_save_radar_plot(deaths_e, 'England', '_england')
 ```
 
 ```python
-create_and_save_radar_plot(deaths_w, 'Wales', '-wales')
+create_and_save_radar_plot(deaths_w, 'Wales', '_wales')
 ```
 
 ```python
-create_and_save_radar_plot(deaths_s, 'Scotland', '-scotland')
+create_and_save_radar_plot(deaths_s, 'Scotland', '_scotland')
 ```
 
 ```python
-create_and_save_radar_plot(deaths_i, 'Northern Ireland', '-northern-ireland')
+create_and_save_radar_plot(deaths_i, 'Northern Ireland', '_northern_ireland')
 ```
 
 ```python Collapsed="false"