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

merged 45 commits into from
May 6, 2024

Commits on May 4, 2024

  1. Feat(emission_factors.csv): Add emission factors for electricity and … 

    …heating
    @veitu
    veitu authored May 4, 2024
    Configuration menu
    Copy the full SHA
    e3c336b View commit details
    Browse the repository at this point in the history

  2. Feat(emission_factors.csv): Add emission factors for transport

    @veitu
    veitu authored May 4, 2024
    Configuration menu
    Copy the full SHA
    d72e470 View commit details
    Browse the repository at this point in the history

  3. Fix(emission_factors.csv): Remove unnecessary columns

    @veitu
    veitu authored May 4, 2024
    Configuration menu
    Copy the full SHA
    f8ea8b9 View commit details
    Browse the repository at this point in the history

  4. Fix(emission_factors.csv): Fix csv

    @veitu
    veitu authored May 4, 2024
    Configuration menu
    Copy the full SHA
    e02b75d View commit details
    Browse the repository at this point in the history

  5. Feat(emission_factors.csv): Add residual mix emission factors where a… 

    …vailable
    @veitu
    veitu authored May 4, 2024
    Configuration menu
    Copy the full SHA
    cd523a7 View commit details
    Browse the repository at this point in the history

  6. Fix(emission_factors.csv): Remove model column

    @veitu
    veitu authored May 4, 2024
    Configuration menu
    Copy the full SHA
    5704696 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2024

  1. Docs(README.md): Update emission factor sources in README

    @veitu
    veitu authored May 5, 2024
    Configuration menu
    Copy the full SHA
    99c7a70 View commit details
    Browse the repository at this point in the history

  2. Update index.rst

    @veitu
    veitu authored May 5, 2024
    Configuration menu
    Copy the full SHA
    6ea73cf View commit details
    Browse the repository at this point in the history

  3. Fix(emission_factors.csv): Add subcategory tram

    @veitu
    veitu authored May 5, 2024
    Configuration menu
    Copy the full SHA
    8e0cd23 View commit details
    Browse the repository at this point in the history

  4. Feat(emission_factors.csv): Add foot and car passenger for ferry again

    @veitu
    veitu authored May 5, 2024
    Configuration menu
    Copy the full SHA
    f3e5872 View commit details
    Browse the repository at this point in the history

  5. Fix(emission_factors.csv): Correct transport category

    @veitu
    veitu authored May 5, 2024
    Configuration menu
    Copy the full SHA
    910f2c3 View commit details
    Browse the repository at this point in the history

  6. Feat(emission_factors.csv): Add large long-distance bus

    @veitu
    veitu authored May 5, 2024
    Configuration menu
    Copy the full SHA
    2b2233a View commit details
    Browse the repository at this point in the history

  7. Move old emission factor files

    @veitu
    veitu authored May 5, 2024
    Configuration menu
    Copy the full SHA
    083ad54 View commit details
    Browse the repository at this point in the history

  8. Delete data/emission_factors_old.csv

    @veitu
    veitu authored May 5, 2024
    Configuration menu
    Copy the full SHA
    d808c4a View commit details
    Browse the repository at this point in the history

  9. Make separate emission factor file for heating

    @veitu
    veitu authored May 5, 2024
    Configuration menu
    Copy the full SHA
    3b99fc7 View commit details
    Browse the repository at this point in the history

  10. Make separate emission factor file for electricity

    @veitu
    veitu authored May 5, 2024
    Configuration menu
    Copy the full SHA
    ad75730 View commit details
    Browse the repository at this point in the history

  11. Make separate emission factor file for transport

    @veitu
    veitu authored May 5, 2024
    Configuration menu
    Copy the full SHA
    f3ea5b5 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'main' into emissionfactors-2024

    @han16nah
    han16nah committed May 5, 2024
    Configuration menu
    Copy the full SHA
    b9fb8d4 View commit details
    Browse the repository at this point in the history

  13. adapt EmissionFators so that it reades splitted csv files incl. tests

    @redfrexx
    redfrexx committed May 5, 2024
    Configuration menu
    Copy the full SHA
    07d13f5 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'main' into emissionfactors-2024

    @codingfabi
    codingfabi committed May 5, 2024
    Configuration menu
    Copy the full SHA
    0b16402 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'emissionfactors-2024' of https://github.com/pledge4futu… 

    …re/co2calculator into emissionfactors-2024
    @codingfabi
    codingfabi committed May 5, 2024
    Configuration menu
    Copy the full SHA
    5805fd9 View commit details
    Browse the repository at this point in the history

  16. create test data folder

    @han16nah
    han16nah committed May 5, 2024
    Configuration menu
    Copy the full SHA
    c883e0d View commit details
    Browse the repository at this point in the history

  17. rename size_class to class

    @han16nah
    han16nah committed May 5, 2024
    Configuration menu
    Copy the full SHA
    c510de6 View commit details
    Browse the repository at this point in the history

  18. remove occupancy stuff

    @han16nah
    han16nah committed May 5, 2024
    Configuration menu
    Copy the full SHA
    522ed6d View commit details
    Browse the repository at this point in the history

  19. remove conversion factor TJ to kWh

    @han16nah
    han16nah committed May 5, 2024
    Configuration menu
    Copy the full SHA
    4ffb06f View commit details
    Browse the repository at this point in the history

  20. test: add tests for enums-data compliancy and adapt enums to new emis… 

    …sion factors
    @redfrexx
    redfrexx committed May 5, 2024
    Configuration menu
    Copy the full SHA
    e411cde View commit details
    Browse the repository at this point in the history

  21. fix: remove old tests which have accidentally been re-added

    @redfrexx
    redfrexx committed May 5, 2024
    Configuration menu
    Copy the full SHA
    74fea97 View commit details
    Browse the repository at this point in the history

  22. fix: remove TrainFuel

    @redfrexx
    redfrexx committed May 5, 2024
    Configuration menu
    Copy the full SHA
    0a42f4f View commit details
    Browse the repository at this point in the history

  23. use test data dir, add fixture, add heating emission param test

    @han16nah
    han16nah committed May 5, 2024
    Configuration menu
    Copy the full SHA
    e8eeee8 View commit details
    Browse the repository at this point in the history

  24. test: test if default parameter combinations exist in csv files, add … 

    …country_code
    @redfrexx
    redfrexx committed May 5, 2024
    Configuration menu
    Copy the full SHA
    d7f4ead View commit details
    Browse the repository at this point in the history

  25. add test for electricity emission factors

    @han16nah
    han16nah committed May 5, 2024
    Configuration menu
    Copy the full SHA
    4eed43a View commit details
    Browse the repository at this point in the history

  26. test: adapt tests to only check if the result is float, instead of co… 

    …mparing the exact co2e estimate
    @redfrexx
    redfrexx committed May 5, 2024
    Configuration menu
    Copy the full SHA
    a65452f View commit details
    Browse the repository at this point in the history

  27. test: add test_enums.py

    @redfrexx
    redfrexx committed May 5, 2024
    Configuration menu
    Copy the full SHA
    8d596fd View commit details
    Browse the repository at this point in the history

  28. test: skip tests for deprecated functions

    @redfrexx
    redfrexx committed May 5, 2024
    Configuration menu
    Copy the full SHA
    e857944 View commit details
    Browse the repository at this point in the history

  29. test: fix tests, which fail because the combination of the passed use… 

    …r value iwth the other default values does not exist, see issue for it on github #164
    @redfrexx
    redfrexx committed May 5, 2024
    Configuration menu
    Copy the full SHA
    ae72bbb View commit details
    Browse the repository at this point in the history

  30. add and skip problematic test for car emission factor

    @han16nah
    han16nah committed May 5, 2024
    Configuration menu
    Copy the full SHA
    23e0d16 View commit details
    Browse the repository at this point in the history

  31. deps: bump version (#183)

    @codingfabi @redfrexx
    codingfabi authored and redfrexx committed May 5, 2024
    Configuration menu
    Copy the full SHA
    4d4e21d View commit details
    Browse the repository at this point in the history

  32. feat: add a calculation function that works generically for all trips (… 

    …#183)

* add a calculation function that works generically for all trips

* add settings.json to vscode

* add tests

* remove leftover business trip function

* bump version
    @codingfabi @redfrexx
    codingfabi authored and redfrexx committed May 5, 2024
    Configuration menu
    Copy the full SHA
    9647bee View commit details
    Browse the repository at this point in the history

  33. data: rename fuel types in emission factors and conversion factors fo… 

    …r heating so they are the same
    @redfrexx
    redfrexx committed May 5, 2024
    Configuration menu
    Copy the full SHA
    b972562 View commit details
    Browse the repository at this point in the history

  34. refactor: refactor energy_share and area_share to own_share

    @redfrexx
    redfrexx committed May 5, 2024
    Configuration menu
    Copy the full SHA
    7c144ea View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. add country_code param to calc_co2_electricity and fix respective test

    @han16nah
    han16nah committed May 6, 2024
    Configuration menu
    Copy the full SHA
    d7575a0 View commit details
    Browse the repository at this point in the history

  2. move range category tests to test_distances.py

    @han16nah
    han16nah committed May 6, 2024
    Configuration menu
    Copy the full SHA
    761ca17 View commit details
    Browse the repository at this point in the history

  3. fix car test

    @han16nah
    han16nah committed May 6, 2024
    Configuration menu
    Copy the full SHA
    5292c95 View commit details
    Browse the repository at this point in the history

  4. make sure heating fuel type is called the same in all data csv files

    @han16nah
    han16nah committed May 6, 2024
    Configuration menu
    Copy the full SHA
    9623fba View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into emissionfactors-2024

    @han16nah
    han16nah committed May 6, 2024
    Configuration menu
    Copy the full SHA
    3dcaa80 View commit details
    Browse the repository at this point in the history