2024 spreadsheet updates #6
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
* correct coal num_tds to account for igcc w/ ccs * Add coal cases, commit errata data
…eadsheet_updates
…-flight 2024 data
mikebannis
reviewed
Feb 20, 2024
| @@ -230,7 +231,7 @@ def calculate_all_debt_fractions(data_workbook_filename: str, output_filename: s | |||
| OUTPUT_FILENAME - File to save calculated debt fractions to. Should end with .csv | |||
| """ | |||
| tech_map: Dict[str, Type[TechProcessor]] = {tech.__name__: tech for tech in LCOE_TECHS} | |||
| techs = LCOE_TECHS if tech is None else [tech_map[tech]] | |||
| techs = [lcoe_calculator.tech_processors.UtilityPvPlusBatteryProc] | |||
There was a problem hiding this comment.
It is not. Looks like I forgot to update this file after getting things working in lcoe calculator. I'll convert the PR to draft.
mikebannis
reviewed
Feb 20, 2024
lcoe_calculator/base_processor.py
Outdated
| @@ -99,7 +99,7 @@ def tech_name(self) -> str: | |||
| dscr: float|None = None # Debt service coverage ratio (unitless, typically 1-1.5) | |||
|
|
|||
| def __init__(self, data_workbook_fname: str, case: str = MARKET_FIN_CASE, | |||
| crp: CrpChoiceType = 30, extractor: Type[AbstractExtractor] = Extractor): | |||
| crp: CrpChoiceType = 30, tcc : str = None, extractor: Type[AbstractExtractor] = Extractor): | |||
There was a problem hiding this comment.
Should be tcc: Optional[str] = None
mikebannis
reviewed
Feb 20, 2024
lcoe_calculator/base_processor.py
Outdated
| itc = self._calc_itc() | ||
|
|
||
| # Trim the first year to eliminate pre-inflation reduction act confusion |
There was a problem hiding this comment.
Is this "trim first year" or is it more of "trim year 20XX"? Will this still be valid next year?
mikebannis
reviewed
Feb 20, 2024
mikebannis
reviewed
Feb 20, 2024
mikebannis
reviewed
Feb 20, 2024
mikebannis
reviewed
Feb 20, 2024
lcoe_calculator/extractor.py
Outdated
| @@ -30,14 +30,16 @@ class Extractor(AbstractExtractor): | |||
| tax_credits_sheet = 'Tax Credits' | |||
|
|
|||
| def __init__(self, data_workbook_fname: str, sheet_name: str, case: str, crp: CrpChoiceType, | |||
| scenarios: List[str], base_year: int): | |||
| scenarios: List[str], base_year: int, tax_credit_case : str = None): | |||
There was a problem hiding this comment.
This is starting to stretch my OOP knowledge, but if tax_credit_case is only used in the child class, I think it can (and should) be left out of the parent constructor. Does that sound right? Also use Optional[str] for the tcc type.
mikebannis
reviewed
Feb 20, 2024
| """ | ||
| @param data_workbook_fname - IGNORED | ||
| @param sheet_name - IGNORED | ||
| @param case - 'Market' or 'R&D' | ||
| @param crp - capital recovery period: 20, 30, or 'TechLife' | ||
| @param scenarios - IGNORED | ||
| @param base_year - IGNORED | ||
| @param tax_credit_case - IGNORED, only used by PV+Battery |
…so handle subset of dates for Nuclear. Some PR comments addressed
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.
Changes: