From 9a404fd9cda6bef7e6a826e4ebc73dbb0e5591b2 Mon Sep 17 00:00:00 2001 From: weibezahn Date: Thu, 1 Oct 2020 16:26:13 +0200 Subject: [PATCH] Release 2020 --- checksums.txt | 6 +++--- processing.ipynb | 43 +++++++++++++++++++------------------------ 2 files changed, 22 insertions(+), 27 deletions(-) diff --git a/checksums.txt b/checksums.txt index 22fd4e2..0286b7f 100644 --- a/checksums.txt +++ b/checksums.txt @@ -1,4 +1,4 @@ -national_generation_capacity.xlsx,d46ebcd1805c4fab6dfbeec38be11ba9e3a395570470ffea66d5023480bc43c6 +national_generation_capacity.xlsx,c3deb84bded1cd25a0fa6b1d00b1b7cfd1c96d69de5db8a7a748f3457dd37191 national_generation_capacity_stacked.csv,4890bf0e329499fbe22da29bd7a1c29418775dbf0f10cd38eff93e3035153d70 -national_generation_capacity_stacked.xlsx,4f854b20b43ef730599bb9d4cac573c992c198543ae56c71d8771e448d2a376d -national_generation_capacity.sqlite,f887cc954d572bdb8bfab4e0b32c01837fcbf2699b6065a8332ae59300740818 +national_generation_capacity_stacked.xlsx,6a4ed2864516f899bbe3de92af846e7c86fa0c36a8bde7da186662d4b22425c2 +national_generation_capacity.sqlite,f23b1e9e16a5775b4c4a7a7397ac7d0ff258119bf7de30a7988689667a6b01ce diff --git a/processing.ipynb b/processing.ipynb index 8de6d88..0f02856 100644 --- a/processing.ipynb +++ b/processing.ipynb @@ -2161,7 +2161,7 @@ "name": "stderr", "output_type": "stream", "text": [ - "01 Oct 2020 08:46:16 - numexpr.utils - INFO - NumExpr defaulting to 4 threads.\n" + "01 Oct 2020 16:07:59 - numexpr.utils - INFO - NumExpr defaulting to 4 threads.\n" ] }, { @@ -2613,7 +2613,7 @@ "name": "stderr", "output_type": "stream", "text": [ - "01 Oct 2020 08:46:16 - root - INFO - Downloading file Statistics.xls\n" + "01 Oct 2020 16:07:59 - root - INFO - Downloading file Statistics.xls\n" ] }, { @@ -3236,21 +3236,21 @@ "name": "stderr", "output_type": "stream", "text": [ - "01 Oct 2020 08:46:18 - root - INFO - Downloading file SO_AF_2011_-_2025_.zip\n", - "01 Oct 2020 08:46:18 - root - INFO - Extracting SO_AF_2011_-_2025_.zip into the directory download\\ENTSO-E\\SO&AF\\2011\n", - "01 Oct 2020 08:46:18 - root - INFO - Reading download\\ENTSO-E\\SO&AF\\2011\\SO&AF 2011 - 2025 Scenario B.xls and transforming into a DataFrame\n", - "01 Oct 2020 08:46:19 - root - INFO - Downloading file 120705_SOAF_2012_Dataset.zip\n", - "01 Oct 2020 08:46:20 - root - INFO - Extracting 120705_SOAF_2012_Dataset.zip into the directory download\\ENTSO-E\\SO&AF\\2012\n", - "01 Oct 2020 08:46:20 - root - INFO - Reading download\\ENTSO-E\\SO&AF\\2012\\SOAF 2012 Scenario B.xls and transforming into a DataFrame\n", - "01 Oct 2020 08:46:21 - root - INFO - Downloading file 130403_SOAF_2013-2030_dataset.zip\n", - "01 Oct 2020 08:46:21 - root - INFO - Extracting 130403_SOAF_2013-2030_dataset.zip into the directory download\\ENTSO-E\\SO&AF\\2013\n", - "01 Oct 2020 08:46:21 - root - INFO - Reading download\\ENTSO-E\\SO&AF\\2013\\ScB.xls and transforming into a DataFrame\n", - "01 Oct 2020 08:46:22 - root - INFO - Downloading file 140602_SOAF%202014_dataset.zip\n", - "01 Oct 2020 08:46:23 - root - INFO - Extracting 140602_SOAF%202014_dataset.zip into the directory download\\ENTSO-E\\SO&AF\\2014\n", - "01 Oct 2020 08:46:23 - root - INFO - Reading download\\ENTSO-E\\SO&AF\\2014\\ScB.xlsx and transforming into a DataFrame\n", - "01 Oct 2020 08:46:24 - root - INFO - Downloading file SO_AF_2015_dataset.zip\n", - "01 Oct 2020 08:46:24 - root - INFO - Extracting SO_AF_2015_dataset.zip into the directory download\\ENTSO-E\\SO&AF\\2016\n", - "01 Oct 2020 08:46:24 - root - INFO - Reading download\\ENTSO-E\\SO&AF\\2016\\SO&AF 2015 dataset\\ScB_publication.xlsx and transforming into a DataFrame\n" + "01 Oct 2020 16:08:00 - root - INFO - Downloading file SO_AF_2011_-_2025_.zip\n", + "01 Oct 2020 16:08:01 - root - INFO - Extracting SO_AF_2011_-_2025_.zip into the directory download\\ENTSO-E\\SO&AF\\2011\n", + "01 Oct 2020 16:08:01 - root - INFO - Reading download\\ENTSO-E\\SO&AF\\2011\\SO&AF 2011 - 2025 Scenario B.xls and transforming into a DataFrame\n", + "01 Oct 2020 16:08:02 - root - INFO - Downloading file 120705_SOAF_2012_Dataset.zip\n", + "01 Oct 2020 16:08:02 - root - INFO - Extracting 120705_SOAF_2012_Dataset.zip into the directory download\\ENTSO-E\\SO&AF\\2012\n", + "01 Oct 2020 16:08:02 - root - INFO - Reading download\\ENTSO-E\\SO&AF\\2012\\SOAF 2012 Scenario B.xls and transforming into a DataFrame\n", + "01 Oct 2020 16:08:03 - root - INFO - Downloading file 130403_SOAF_2013-2030_dataset.zip\n", + "01 Oct 2020 16:08:04 - root - INFO - Extracting 130403_SOAF_2013-2030_dataset.zip into the directory download\\ENTSO-E\\SO&AF\\2013\n", + "01 Oct 2020 16:08:04 - root - INFO - Reading download\\ENTSO-E\\SO&AF\\2013\\ScB.xls and transforming into a DataFrame\n", + "01 Oct 2020 16:08:05 - root - INFO - Downloading file 140602_SOAF%202014_dataset.zip\n", + "01 Oct 2020 16:08:05 - root - INFO - Extracting 140602_SOAF%202014_dataset.zip into the directory download\\ENTSO-E\\SO&AF\\2014\n", + "01 Oct 2020 16:08:05 - root - INFO - Reading download\\ENTSO-E\\SO&AF\\2014\\ScB.xlsx and transforming into a DataFrame\n", + "01 Oct 2020 16:08:06 - root - INFO - Downloading file SO_AF_2015_dataset.zip\n", + "01 Oct 2020 16:08:07 - root - INFO - Extracting SO_AF_2015_dataset.zip into the directory download\\ENTSO-E\\SO&AF\\2016\n", + "01 Oct 2020 16:08:07 - root - INFO - Reading download\\ENTSO-E\\SO&AF\\2016\\SO&AF 2015 dataset\\ScB_publication.xlsx and transforming into a DataFrame\n" ] }, { @@ -6720,11 +6720,6 @@ "name": "stdout", "output_type": "stream", "text": [ - "Deleted: download\\2019-2-23-120705_SOAF_2012_Dataset.zip\n", - "Deleted: download\\2019-2-23-130403_SOAF_2013-2030_dataset.zip\n", - "Deleted: download\\2019-2-23-140602_SOAF%202014_dataset.zip\n", - "Deleted: download\\2019-2-23-SO_AF_2011_-_2025_.zip\n", - "Deleted: download\\2019-2-23-SO_AF_2015_dataset.zip\n", "Deleted: download\\ENTSO-E\\SO&AF\\2011\\SO_AF_2011_-_2025_.zip\n", "Deleted: download\\ENTSO-E\\SO&AF\\2012\\120705_SOAF_2012_Dataset.zip\n", "Deleted: download\\ENTSO-E\\SO&AF\\2013\\130403_SOAF_2013-2030_dataset.zip\n", @@ -7037,7 +7032,7 @@ }, { "cell_type": "code", - "execution_count": 52, + "execution_count": 48, "metadata": {}, "outputs": [], "source": [ @@ -7052,7 +7047,7 @@ }, { "cell_type": "code", - "execution_count": 53, + "execution_count": 49, "metadata": {}, "outputs": [], "source": [