Skip to content

New application disaggregation functions #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 28 commits into
base: DevTUB
Choose a base branch
from
Open

New application disaggregation functions #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
c34c09b
config.py: update assignment of shift profiles to industry branches.
PVerwiebe Aug 7, 2020
580e4da
data: updated function generate_specific_consumption_per_branch() wit…
PVerwiebe Aug 7, 2020
53a9eb3
Notebook 03: minor update regarding database, spatial_id of consumpti…
PVerwiebe Aug 7, 2020
e6a7b78
data_in: update data_in folder with #1 new datasets from AGEB for add…
PVerwiebe Aug 20, 2020
c447165
config.py: added additional historic weather years. this dictionary c…
PVerwiebe Aug 20, 2020
541d9dc
data.py: function efficiency_ehancement() now does not raise an error…
PVerwiebe Aug 20, 2020
8fa270e
data: ambient temperature is now set to be actual hourly values and n…
PVerwiebe Aug 20, 2020
aaaabf2
data: throughput of argument 'year' from function generate_specific_c…
PVerwiebe Aug 20, 2020
a786be2
spatial.py: throughput of argument 'year' from function disagg_CTS_in…
PVerwiebe Aug 20, 2020
5565d34
temporal: throughput of argument 'year' from temporal functions spati…
PVerwiebe Aug 20, 2020
1239247
data.py: fixed bug with read_excel
PVerwiebe Aug 21, 2020
8fec3d5
data: fixed problem with projection in CTS and industry. now correct …
PVerwiebe Aug 25, 2020
bc4980e
data: bugfixes after pandas update with read_excel() and adjusted yea…
PVerwiebe Sep 3, 2020
69db5a6
temporal: bugfix in disagg_temporal_power_CTS and throughput of argum…
PVerwiebe Sep 3, 2020
acaaa17
created new demo file
FaKurz Sep 16, 2020
a282c9a
shifted the functions out of the notebook
FaKurz Sep 17, 2020
f09a912
more updates
FaKurz Sep 23, 2020
f069fa1
changes to the temporal function
FaKurz Sep 29, 2020
7f1eeed
Work on plausibility issues
FaKurz Oct 3, 2020
5944d04
bugfix
FaKurz Oct 5, 2020
11ea036
Update temporal.py
FaKurz Oct 9, 2020
217ebcf
integrated plot function
FaKurz Oct 9, 2020
08f5e70
Update 03_Demo_CTS_Industry_disaggregation.ipynb
FaKurz Oct 9, 2020
d4e0be4
more years
FaKurz Oct 18, 2020
1c33005
renaming variables
FaKurz Oct 18, 2020
5c918e0
Delete test.xlsx
FaKurz Oct 18, 2020
6b194b3
Update XX_Demo_application_disaggregations.ipynb
FaKurz Oct 18, 2020
fd51f5a
Update 90_Accessing_geographical_data.ipynb
FaKurz Oct 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions 03_Demo_CTS_Industry_disaggregation.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1773,7 +1773,7 @@
"#### Function ``generate_specific_consumption_per_branch()``\n",
"This function is the basis for ``generate_specific_consumption_per_branch_and_district()`` and doesn't take any arguments. It returns multiple dataframes which you can see in the demonstation below.\n",
"\n",
"The values are based on the publication [Umweltökonomische Gesamtrechnung, 2017](https://www.destatis.de/DE/Themen/Gesellschaft-Umwelt/Umwelt/Publikationen/Umweltnutzung-Wirtschaft/umweltnutzung-und-wirtschaft-energie-pdf-5850014.html) for 2015, which is also available from the DemandRegio database (table_id = 38, with some industry branches (WZ) being grouped together and with ET = 12 for gas and ET = 18 for electricity)"
"The values are based on the publication [Umweltökonomische Gesamtrechnung, 2017](https://www.destatis.de/DE/Themen/Gesellschaft-Umwelt/Umwelt/Publikationen/Umweltnutzung-Wirtschaft/umweltnutzung-und-wirtschaft-energie-pdf-5850014.html) for 2015, which is also available from the DemandRegio database (table_id = 71, with some industry branches (WZ) being grouped together and with ET = 12 for gas and ET = 18 for electricity)"
]
},
{
Expand Down Expand Up @@ -2020,7 +2020,7 @@
}
],
"source": [
"## absolute consumption as in \"Umweltökonomischer Gesamtrechnung\" for the year 2015, in Database dimension='spatial', table_id=38,\n",
"## absolute consumption as in \"Umweltökonomischer Gesamtrechnung\" for the year 2015, in Database dimension='spatial', table_id=71,\n",
"df_abs_consumption.head()"
]
},
Expand Down Expand Up @@ -4775,7 +4775,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.3"
"version": "3.7.8"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion 04_Demo_temporal_disaggregations.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3971,7 +3971,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.3"
"version": "3.7.8"
}
},
"nbformat": 4,
Expand Down
9 changes: 7 additions & 2 deletions 90_Accessing_geographical_data.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,12 @@
{
"cell_type": "code",
"execution_count": 9,
"metadata": {},
"metadata": {
"collapsed": true,
"jupyter": {
"outputs_hidden": true
}
},
"outputs": [
{
"data": {
Expand Down Expand Up @@ -959,7 +964,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.3"
"version": "3.7.8"
}
},
"nbformat": 4,
Expand Down
Loading