8000 Update IO data by MoLi7 · Pull Request #221 · USEPA/useeior · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Update IO data #221

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 214 commits into from
Jul 27, 2022
Merged

Update IO data #221

merged 214 commits into from
Jul 27, 2022

Conversation

MoLi7
Copy link
Collaborator
@MoLi7 MoLi7 commented Mar 28, 2022

This PR will include

  1. modified code and functions for downloading and saving IO data up to 2020 (most recent year BEA has provided)
  2. updated rda of data and json of metadata

MoLi7 added 30 commits March 24, 2021 11:13
@MoLi7
Merge pull request #118 from USEPA/master
647f77d 
Bring linkstateior up-to-date with master
@MoLi7
Add functions for loading state IO data
6b0a6e5
@MoLi7
Add stateior under Remotes in DESCRIPTION
417ea1d
@MoLi7
Update loadIOdata function
cb26212
@MoLi7
Update loadIOdata function
a7fef5f
@MoLi7
Resolve merge heads
02055e8 
Merge branch 'linkstateior' of https://github.com/USEPA/useeior into linkstateior

# Conflicts:
#	R/LoadIOTables.R
@MoLi7
Temporarily remove model <- loadTwoRegionIOData(model)
5109a59
@MoLi7
Merge pull request #139 from USEPA/master
8c118ab 
Bring linkstateior up-to-date with master
@MoLi7
Add stateior in DESCRIPTION
1eaa1b3
@MoLi7
Update loadTwoRegionStateIOtables and loadTwoRegionIOData functions t…
36f6f1e 
…o intergrate stateior
@MoLi7
Add transformation of model$FinalDemand in loadTwoRegionIOData function
98640bb
@MoLi7
Update linkstateior branch to useeior v0.4 release
9878ba3 
Merge branch 'master' into linkstateior
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
@MoLi7
Refactor load IO data functions
324da34
@MoLi7
Change Distribution to Transportation in Schem_Info.csv
5182b2c
@MoLi7
Minor modification in ordering MarginsTable
151b671
@MoLi7
Simplify model$UseValueAdded -> model$ValueAdded
6a21f38
@MoLi7
Delete StateIO$Demand
a747b10
@MoLi7
Add GAUSEEIOv2.0s-WAT_nodisagg.yml
a005770
@MoLi7
Minor fix in LoadIOTables.R
12b5678
@MoLi7
Update FlowBySector parquet file name for GAUSEEIO model
03b11c9
@MoLi7
Update mapFIPS5toLocationCodes function and its usage
a028764
@MoLi7
Add a utility function formatLocationforStateModels to convert state …
646967b 
…name to US-ST format for state models
@MoLi7
Refactor conformTbStoIOSchema to accommodate to state tbs tables
3cc4a90
@MoLi7
Refactor the process of mapping location code to name
c7fbdc0
@MoLi7
Modify the process of mapping location code to name
2a1641a
@MoLi7
Refactor conformTbStoIOSchema - move location modification to the beg…
587565c 
…inning
@MoLi7
Change demand vectors location from 'GA' to 'US-GA' in GAUSEEIO model…
37eb5c9 
… specs
@MoLi7
Refactor loadDemandVectors based on demand vector metadata
7015a63
@MoLi7
Refactor adjustOutputbyCPI
d5428eb
@MoLi7
Modify if-else test expression in conformTbStoIOSchema
4be4b1e
@MoLi7
Copy link
Collaborator Author
MoLi7 commented Jul 25, 2022

@bl-young 7939d97 brought the changes you made in #234 to develop then to updateIO.

I know there is a remaining issue #233 and @jvendries can work in develop or another branch to fix it, but I want to modify this PR to target master instead of develop in order to enable automatic CI/CD runs.

@MoLi7 MoLi7 changed the base branch from develop to master July 25, 2022 16:41
@a-w-beck
Copy link
Contributor

Reminded by this error that we need to add tibble under Imports in DESCRIPTION. Suppose @a-w-beck had 3.1.6 (or 3.1.7) when deploying it in May?

@MoLi7 I believe I had 3.1.5, but given the current dplyr >= 1.0.6 requirement I'd recommend just tibble >= 2.1.3 (retreived from dplyr 1.0.6's DESCRIPTION file)

MoLi7 and others added 18 commits July 25, 2022 15:34
@MoLi7
Update DESCRIPTION: import tibble >= 2.1.3
a478709 
credit: @a-w-beck
@MoLi7
Update package version to 1.1.0
7e52d1f
@MoLi7
Create GH actions workflow for downloading and saving BEA data
bf2e61b
@MoLi7
Update GH actions for BEA data saving
f81569b
@MoLi7
Temporarily do not ignore .yaml in GH actions workflow
a4fd9b9
@MoLi7
Update GH actions for saving BEA data
c2581ee
@MoLi7
Update GH actions for saving BEA data
9975ef4
@MoLi7
Allow *.yaml to trigger BEA data saving GH actions
3f8200a
@MoLi7
Update GH actions for saving BEA data
3933907
@jvendries
Updated allocation percentages for waste disaggregation to work with …
28e1180 
…the most recent changes to the economic values from BEA
@MoLi7
Omit "inst/" from file path when using system.file()
db889d2
@MoLi7
Merge branch 'updateIO' of https://github.com/USEPA/useeior into upda…
407f2c2 
…teIO
@MoLi7
Fix error in code
f27b103
@MoLi7
Modift quote variable when reading csv with single quotation mark
b13b8b1
@github-actions
Update BEA data
2eece7a
@MoLi7
Do not trigger "save BEA data" runner with changes in .yaml
3288cf5
@MoLi7
Only allow manual trigger for updating BEA data
86ee374
@MoLi7
Bump r-lib/actions to v2, avoid error cause by MASS
cb59309 
r-lib/pak#393
@MoLi7
Copy link
Collaborator Author
MoLi7 commented Jul 27, 2022

Thanks everyone for your inputs. This PR is ready to be merged.

@MoLi7 MoLi7 merged commit b1256ae into master Jul 27, 2022
@catherinebirney catherinebirney mentioned this pull request Aug 10, 2022
Merged
@bl-young bl-young deleted the updateIO branch October 26, 2022 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@WesIngwersen WesIngwersen WesIngwersen left review comments

@bl-young bl-young bl-young left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@MoLi7 @WesIngwersen @bl-young @jvendries @a-w-beck
0