Skip to content
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

Jump to bottom

Emissionfactors 2024 #173

Merged
merged 45 commits into from
May 6, 2024
Merged

Emissionfactors 2024 #173

Changes from 6 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
e3c336b
Feat(emission_factors.csv): Add emission factors for electricity and …
veitu May 4, 2024
d72e470
Feat(emission_factors.csv): Add emission factors for transport
veitu May 4, 2024
f8ea8b9
Fix(emission_factors.csv): Remove unnecessary columns
veitu May 4, 2024
e02b75d
Fix(emission_factors.csv): Fix csv
veitu May 4, 2024
cd523a7
Feat(emission_factors.csv): Add residual mix emission factors where a…
veitu May 4, 2024
5704696
Fix(emission_factors.csv): Remove model column
veitu May 4, 2024
99c7a70
Docs(README.md): Update emission factor sources in README
veitu May 5, 2024
6ea73cf
Update index.rst
veitu May 5, 2024
8e0cd23
Fix(emission_factors.csv): Add subcategory tram
veitu May 5, 2024
f3e5872
Feat(emission_factors.csv): Add foot and car passenger for ferry again
veitu May 5, 2024
910f2c3
Fix(emission_factors.csv): Correct transport category
veitu May 5, 2024
2b2233a
Feat(emission_factors.csv): Add large long-distance bus
veitu May 5, 2024
083ad54
Move old emission factor files
veitu May 5, 2024
d808c4a
Delete data/emission_factors_old.csv
veitu May 5, 2024
3b99fc7
Make separate emission factor file for heating
veitu May 5, 2024
ad75730
Make separate emission factor file for electricity
veitu May 5, 2024
f3ea5b5
Make separate emission factor file for transport
veitu May 5, 2024
b9fb8d4
Merge branch 'main' into emissionfactors-2024
han16nah May 5, 2024
07d13f5
adapt EmissionFators so that it reades splitted csv files incl. tests
redfrexx May 5, 2024
0b16402
Merge branch 'main' into emissionfactors-2024
codingfabi May 5, 2024
5805fd9
Merge branch 'emissionfactors-2024' of https://github.com/pledge4futu…
codingfabi May 5, 2024
c883e0d
create test data folder
han16nah May 5, 2024
c510de6
rename size_class to class
han16nah May 5, 2024
522ed6d
remove occupancy stuff
han16nah May 5, 2024
4ffb06f
remove conversion factor TJ to kWh
han16nah May 5, 2024
e411cde
test: add tests for enums-data compliancy and adapt enums to new emis…
redfrexx May 5, 2024
74fea97
fix: remove old tests which have accidentally been re-added
redfrexx May 5, 2024
0a42f4f
fix: remove TrainFuel
redfrexx May 5, 2024
e8eeee8
use test data dir, add fixture, add heating emission param test
han16nah May 5, 2024
d7f4ead
test: test if default parameter combinations exist in csv files, add …
redfrexx May 5, 2024
4eed43a
add test for electricity emission factors
han16nah May 5, 2024
a65452f
test: adapt tests to only check if the result is float, instead of co…
redfrexx May 5, 2024
8d596fd
test: add test_enums.py
redfrexx May 5, 2024
e857944
test: skip tests for deprecated functions
redfrexx May 5, 2024
ae72bbb
test: fix tests, which fail because the combination of the passed use…
redfrexx May 5, 2024
23e0d16
add and skip problematic test for car emission factor
han16nah May 5, 2024
4d4e21d
deps: bump version (#183)
codingfabi May 5, 2024
9647bee
feat: add a calculation function that works generically for all trips…
codingfabi May 5, 2024
b972562
data: rename fuel types in emission factors and conversion factors fo…
redfrexx May 5, 2024
7c144ea
refactor: refactor energy_share and area_share to own_share
redfrexx May 5, 2024
d7575a0
add country_code param to calc_co2_electricity and fix respective test
han16nah May 6, 2024
761ca17
move range category tests to test_distances.py
han16nah May 6, 2024
5292c95
fix car test
han16nah May 6, 2024
9623fba
make sure heating fuel type is called the same in all data csv files
han16nah May 6, 2024
3dcaa80
Merge branch 'main' into emissionfactors-2024
han16nah May 6, 2024
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
Loading
Loading