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.

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

Update cost expression names & split out expressions #685

Merged
merged 7 commits into from
Oct 15, 2024

Conversation

brynpickering
Copy link
Member

Fixes #645

The only thing I have chosen to not implement from #645 is cost_investment -> cost_investment_total. I'm not sure that _total adds anything...

Summary of changes in this pull request

  • the total capital cost is now cost_investment
  • the annualised capital cost is now cost_investment_annualised
  • fixed operation costs are now cost_operation_fixed
  • variable operation costs are now cost_operation_variable
  • total cost is the sum of cost_investment_annualised, cost_operation_fixed, and cost_operation_variable.

Reviewer checklist

  • Test(s) added to cover contribution
  • Documentation updated
  • Changelog updated
  • Coverage maintained or improved

Copy link

codecov bot commented Sep 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.95%. Comparing base (c00486b) to head (fd20445).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #685   +/-   ##
=======================================
  Coverage   95.95%   95.95%           
=======================================
  Files          29       29           
  Lines        4025     4026    +1     
  Branches      845      775   -70     
=======================================
+ Hits         3862     3863    +1     
  Misses         72       72           
  Partials       91       91           
Files with missing lines Coverage Δ
src/calliope/backend/helper_functions.py 96.86% <100.00%> (+0.01%) ⬆️

@brynpickering
Copy link
Member Author

@sstroemer can you check that this is what you were thinking w.r.t. updating expressions?

@sstroemer
Copy link
Contributor

@sstroemer can you check that this is what you were thinking w.r.t. updating expressions?

@brynpickering Looks really good!

Copy link
Member

@sjpfenninger sjpfenninger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, much clearer than before!

@brynpickering brynpickering merged commit b2d2dd1 into main Oct 15, 2024
13 checks passed
@brynpickering brynpickering deleted the update-cost-expr-naming branch October 15, 2024 18:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Potential misinterpretation of (internal) cost calculation related to OM cost term
3 participants