replacing unit by in_kwh parameter for heating - fixes #223 #227
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Christina Ludwig <[email protected]>
…4future/co2calculator into gen_start_dest_input_#205
Gen start dest input #205
…, removed in_kwh from output to mitigate repetition
|
Nice solution! I agree that it is important that the unit can be returned in the end 👍 |
…and get_options() to _EnergyFromHeating to return unit of each fuel_type
redfrexx
reviewed
Mar 13, 2025
co2calculator/api/energy.py
Outdated
| """ | ||
| if unit is not None and not isinstance(unit, str): | ||
| raise ValueError("unit must be a string") | ||
| if self.fuel_type is None and not in_kwh: |
There was a problem hiding this comment.
Looking at it again, I feel like it would be more intuitive for the user if we pass all parameters in the from_heating function. So the Energy class wouldn't take any parameters and would only be a container for the methods.
redfrexx
reviewed
Mar 13, 2025
| def get_options(self): | ||
| """Return fuel type options and their corresponding units as a table.""" | ||
|
|
||
| options = { |
There was a problem hiding this comment.
btw Are the fuel_type options the same for electricity and heating?
redfrexx
requested changes
Mar 13, 2025
| @@ -101,6 +100,7 @@ def test_compare_enums_with_data(column_name, enum, emission_category, subcatego | |||
| pytest.param(TrainEmissionParameters, id="train"), | |||
| pytest.param(FerryEmissionParameters, id="ferry"), | |||
| pytest.param(MotorbikeEmissionParameters, id="motorbike"), | |||
| pytest.param(HeatingEmissionParameters, id="plane"), | |||
There was a problem hiding this comment.
Suggested change
| pytest.param(HeatingEmissionParameters, id="plane"), | |
| pytest.param(PlaneEmissionParameters, id="plane"), |
There was a problem hiding this comment.
or is it supposed to be PlaneEmissionParameters?
…, removed in_kwh from output to mitigate repetition
…and get_options() to _EnergyFromHeating to return unit of each fuel_type
…ething off with the distance calculations. Needs to get checked again. Related to #228
…) method. So Energy class is only container for methods.
… of the trip class
…and the associated coordinates
TransportEmission() class now returns start and destination location and the associated coordinates
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.