-
Notifications
You must be signed in to change notification settings - Fork 3
Feat 167 rtl prc #348
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
Merged
Merged
Feat 167 rtl prc #348
Changes from all commits
Commits
Show all changes
38 commits
Select commit
Hold shift + click to select a range
8c1a0be
Corrects distribution cost description
mckennapep 9645839
Sets up option for retail price
mckennapep 4d4948a
Sets up generic ResultsTemplate method for cross-table results
mckennapep 86a1bad
Adjusts retail rate set up for COS regions
mckennapep a05cf66
Adds past_invest option to config file to work with aggregated gen model
mckennapep a9a0e37
Adjustments so that past_invest_cost_total can be included in retail …
mckennapep f749cdd
Moves get_cross_table function to correct location
mckennapep 326f07f
Moves get_cross_table function to the correct location
mckennapep 6cf66c4
Option to add calibrator values to retail price calculation set up
mckennapep 2b8ed3b
Sets up mod that calcultes the calibrator values for retail price
mckennapep 1fdb8cf
Moves helpful functions in ResultsTemplate to util
mckennapep 0e3d93d
Creates a RetailPrice mod that has option to calculate calibrator val…
mckennapep a6e601d
Adjusts kwargs for retail price calibrator
mckennapep 4ae6c4f
Warns if retail price row does not have corresponding calibrator
mckennapep e03be1b
Specialized methods for different calibraton modes
mckennapep 6cfb9de
Option to apply ref value to all years
mckennapep 113db58
Second calibration step to ensure average price for larger region mat…
mckennapep eafd974
Removes a previous version of retail price mod
mckennapep 48aafee
Updates doc string, clean up and comment code
mckennapep 4b7033b
Minor fixes for past invest calculation so that results doesn't error…
mckennapep d1c700f
Fixes bug in how cal value calculation handles reference values witho…
mckennapep d9966bc
Removes incorrect calibration mod from e4st.jl
mckennapep fb8cac6
Adjusts how mode and input files are handled in mod
mckennapep 63fcce4
Updates calculation of generation standard payments
mckennapep 3f15a0c
Fix bugs that were found in tests
mckennapep 3aed8a5
Set up tests for retail price mode
mckennapep 31e185d
Adjusts payment calculation for when a year doesn't have a target
mckennapep 7d7fd61
Delete one of two retail price includes in runtests
mckennapep ea6a0ad
Fixes so that resreq is added with any name and code cov improves
mckennapep 73cd20a
Retail price calc updated so that merchandising surplus is not distri…
mckennapep 8a6e5eb
Includes comments in retail price
mckennapep cdd3941
Add to docs of RetailPrice mod
mckennapep 243ce17
Fix bug in test
mckennapep d2dd0e5
Fixes for get_cal_values mode with multi-year reference prices
mckennapep d76d165
Merge remote-tracking branch 'origin/main' into feat-167-rtl-prc
mckennapep a3f40e2
Merge remote-tracking branch 'origin/main' into feat-167-rtl-prc
mckennapep 6ac56f9
Fixes calibrator output table when area is empty, and improves comments
mckennapep c5a221f
Merge branch 'main' into feat-167-rtl-prc
mckennapep File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
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.
Should the other emission level columns (so2, nox, pm25) also be included here?