-
Notifications
You must be signed in to change notification settings - Fork 20
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
Incorporation of import factors for one and two-region models #288
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
…ignate whether external import factors are used
…ames from io_table_names, and added them in the if statement for stateior only models
…to avoid errors when the parameter is not specified
compare2RCommodityTotals to compare2RVectorTotals to make it more broadly useful
…F values generated using the Swedish calculation method
…ns in print2RValidationResults()
…e variable name for imported M matrix for clarity.
# Conflicts: # R/BuildModel.R # R/IOFunctions.R
… to compare2RVectorTotals)
…RCommodityTotals)
…l import factor data from csv files
…idateIMportA function as that is not a model object that
…at call createDisaggFilesFromProxyData function, i.e., models that use Proxy data instead of national detail data in the disaggregation
… Tau when factors arein Basic Price
…ned a characterization factor
jvendries
reviewed
May 10, 2024
jvendries
reviewed
May 10, 2024
jvendries
reviewed
May 10, 2024
jvendries
reviewed
May 10, 2024
… disaggregation in disaggregateFunctions.R
…R models with disaggregated utilities and is not yet implemented
jvendries
approved these changes
May 15, 2024
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.
Made a few edits to clarify code related to 2R disaggregation but looks good to pull in.
bl-young
commented
May 16, 2024
This was
linked to
issues
May 23, 2024
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.
Also includes calculations of household emissions