-
Notifications
You must be signed in to change notification settings - Fork 33
Updates for HIO and WIO #268
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
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
added a check for WIO specs statement in LoadIOTables.R added WIOtest_env and WIOtest_tech files for testing WIO functions
…ecs and incliude the modifications
…the WIO sector list)
…nction. I.e.: removed apostrophes from files csv files; added appropriate number of layers to WIOtest.yml file
…saggregateSetup can be used for WIO models
…e the new data read in through WIOSpecs will be added to the model objects
…SD" instead of "$"
…or easier handling inside the code
…mns to the UseTransactions and populates the values according to the WIOtest_Use.csv file
-In includeMakeWIO function: added code to include WIO sectors in MakeTransactions
…dity, as well as Industry and CommodityOutput
Adjusted internationalTradeAdjustment dimensions to be consistent with number of WIO objects
… calculated depending on whether the modelType is "WIO"
…input file does not include the intersections of the new processes with a value of 0
Consolidate WIO branches
# Conflicts: # R/DisaggregateFunctions.R # R/Hybridization.R # R/UtilityFunctions.R
…torCodes -> NewSectorCodes, DisaggregatedSectorNames -> NewSectorNames
# Conflicts: # R/DisaggregateFunctions.R # R/UtilityFunctions.R
Update WIO branch through v1.4
Collaborator
Author
|
new errors in testing arising only on mac seem to be associated with the new release of arrow 15.0.1 (was passing under 14.0.0.2) |
Merged
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.
Preparing for v1.5 release.