Update WIO branch through v1.4 #266
Merged
Conversation
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
these links should be relative... they had a full path that included a deleted branch name
Release v1.3.0
Updates for two-region EEIO models
…yms (i.e., Value Add)
update heatmapSectorRanking to work for two-region models
…EEIOmodel and sends them to the FINAL perspective calc function.
…ing-final-perspective-domestic-versions-of-m-and-d-not-used Fixes #262. Sets M and N to respective domestic versions in calculateEEIOmodel
…o release-v1.4.0
…ted in other ways
# Conflicts: # R/DisaggregateFunctions.R # R/Hybridization.R # R/UtilityFunctions.R
…torCodes -> NewSectorCodes, DisaggregatedSectorNames -> NewSectorNames
Collaborator
Author
|
@WesIngwersen I can also go ahead and pull in v1.4 but will need to take a look at any conflicts |
# Conflicts: # R/DisaggregateFunctions.R # R/UtilityFunctions.R
Collaborator
Author
|
@WesIngwersen - let's use this branch moving forward for HIO models which is up to date with the rest of useeior now. I'd recommend we hold off on pulling this in (to the old WIO branch) while we finish re-running results in case any errors crop up. |
Collaborator
Author
|
@WesIngwersen @jvendries i'm going to pull this back in to WIO if ok with you |
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.
Pulls in and resolves conflicts with current master release of useeio (v1.3) and next expected release (v1.4). All models build in build_and_save_models.R