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

Calculate CapitalInvestment using discount rate with/without technology index #213

Merged
merged 5 commits into from
Jan 25, 2024

Conversation

willu47
Copy link
Member

@willu47 willu47 commented Jan 19, 2024

Ensures that CapitalInvestment is calculated using either a DiscountRate or DiscountRateIdv parameter.

Description

Modified the crf() function so that it calculates the capital recovery factor by region and technology using either a technology independent or technology specific discount rate.

Issue Ticket Number

Resolves #197

Documentation

No additional documentation provided.

@willu47 willu47 requested a review from HauHe January 19, 2024 14:35
@willu47 willu47 self-assigned this Jan 19, 2024
@willu47 willu47 requested a review from trevorb1 January 23, 2024 09:04
Copy link
Member

@trevorb1 trevorb1 left a comment

Choose a reason for hiding this comment

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

Thanks for getting to this, @willu47! Looks great to me! Just a couple comments, plus I added a changelog note.

src/otoole/results/result_package.py Outdated Show resolved Hide resolved
src/otoole/results/result_package.py Outdated Show resolved Hide resolved
@willu47 willu47 merged commit 15bdc0b into master Jan 25, 2024
12 of 14 checks passed
@willu47 willu47 deleted the issue_197 branch January 25, 2024 12:05
Copy link
Contributor

@HauHe HauHe left a comment

Choose a reason for hiding this comment

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

I tested the new version also locally on CBC results generated with the fast code that previously created the issue, and it works.

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.

[Bug]: CapitalInvestment not being calculated
3 participants