Feature/gsye 650 heatpump fixes #493
Merged
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
…cy and self-consumption calculation.
…atpump and Virtual Heatpump strategies. Added total_traded_energy_kWh to the AVRO schema.
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #493 +/- ##
==========================================
- Coverage 66.52% 66.50% -0.03%
==========================================
Files 81 81
Lines 5267 5269 +2
Branches 861 862 +1
==========================================
Hits 3504 3504
- Misses 1602 1603 +1
- Partials 161 162 +1 |
Comment on lines
69
to
+73
| if is_load_node_type(child): | ||
| self.total_energy_demanded_wh += child_stats.get("total_energy_demanded_wh", 0) | ||
| if is_heatpump_node_type(child): | ||
| self.total_energy_demanded_wh += ( | ||
| child_stats.get("total_traded_energy_kWh", 0) * 1000.0) |
There was a problem hiding this comment.
grrrrr, not pretty, but this is how it is with heritage. :-)
There was a problem hiding this comment.
Yeah, this is the unfortunate thing with inheritance and with mixing units as well. At least from now on, we should probably stick to kWh no matter what FE or customers say.
gsy_framework/sim_results/kpi.py
Outdated
| @@ -52,7 +52,7 @@ def accumulate_devices(self, area_dict: Dict): | |||
| if "DH" in area_dict["name"]: | |||
| return | |||
| for child in area_dict["children"]: | |||
| if is_producer_node_type(child) or is_heatpump_node_type(child): | |||
There was a problem hiding this comment.
of course! Thanks for fixing!
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.