-
Notifications
You must be signed in to change notification settings - Fork 21
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.
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
GSYE-839: Corrected savings calculation, taking into account by inclu… #1825
Conversation
…ding the savings from the revenue in addition to the savings from buying energy from community. Corrected the default grid fee reduction value to be 1, so that intracommunity trading does not include any grid fees by default.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1825 +/- ##
==========================================
- Coverage 69.61% 69.59% -0.03%
==========================================
Files 150 150
Lines 14227 14247 +20
Branches 2666 2670 +4
==========================================
+ Hits 9904 9915 +11
- Misses 3794 3805 +11
+ Partials 529 527 -2 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, only left some minor comments
@@ -278,7 +278,7 @@ class AreaFees: | |||
|
|||
grid_import_fee_const: float = 0.0 | |||
grid_export_fee_const: float = 0.0 | |||
grid_fees_reduction: float = 0.0 | |||
grid_fees_reduction: float = 1.0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
@@ -539,14 +557,17 @@ class AreaEnergyBillsWithoutSurplusTrade(AreaEnergyBills): | |||
"""Dedicated AreaEnergyBills class, specific for the non-suplus trade SCM.""" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"""Dedicated AreaEnergyBills class, specific for the non-suplus trade SCM.""" | |
"""Dedicated AreaEnergyBills class, specific for the non-surplus trade SCM.""" |
comm_bills["savings"] = savings | ||
comm_bills["savings_from_buy_from_community"] = savings_from_buy_from_community | ||
comm_bills["savings_from_sell_to_community"] = savings_from_sell_to_community |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So you decided to export all of them, even though the "savings" already include the other two for the "normal" AreaEnergyBills ?
I guess this is in order not to break the existing workflow, right? However, I do not see the last two begin used on the gsy-web. Can you please point me to them?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was actually thinking to save these in the DB for debugging purposes, but later on I figured out that it is probably an overkill to maintain them just for debugging. Will remove these both from here and from the gsy-framework, thanks for catching this!
…ding the savings from the revenue in addition to the savings from buying energy from community. Corrected the default grid fee reduction value to be 1, so that intracommunity trading does not include any grid fees by default.
Reason for the proposed changes
Please describe what we want to achieve and why.
Proposed changes
INTEGRATION_TESTS_BRANCH=master
GSY_FRAMEWORK_BRANCH=master