Skip to content
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

State level initial #128

Merged
merged 99 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
9d00098
Updated utils used in loading in data to include state level (untested)
heaston-indecon Oct 13, 2023
86e8c46
Adjusted utils for loading data to accomodate state
heaston-indecon Oct 17, 2023
5ca2634
Updated utils to cooperate with new state data configuration in FrEDI…
maddockw Oct 24, 2023
246f66b
Update README.md
heaston-indecon Oct 25, 2023
9b9d890
Added `kableExtra` package into suggests
heaston-indecon Oct 25, 2023
1cbc331
JOSS review edits - Examples 1 and 2
heaston-indecon Oct 25, 2023
25b1ea3
Update utils.R
knoiva-indecon Oct 25, 2023
bb231cc
Merge branch 'main' into state_level_initial_kmn_mergeMain
knoiva-indecon Oct 25, 2023
bf09e21
Update utils.R
knoiva-indecon Oct 25, 2023
bb0babd
Merge pull request #112 from USEPA/state_level_initial_kmn
knoiva-indecon Oct 25, 2023
9778ce3
Added headers, format more consistent with hector
heaston-indecon Oct 26, 2023
59fa017
Added contributions guide
heaston-indecon Oct 26, 2023
9c24dcc
Updated get_econAdjValues and get_annual_model_stats
heaston-indecon Oct 27, 2023
c69f904
First batch of byState changes to run_fredi
maddockw Nov 3, 2023
7e09f21
Completing initial state-level changes to run_fredi
maddockw Nov 6, 2023
a3c49f4
Initial fixes
knoiva-indecon Nov 7, 2023
bc18b3c
Update sysdata.rda
knoiva-indecon Nov 8, 2023
ffe3f32
Update temps2slr.R
knoiva-indecon Nov 8, 2023
07068a9
Update utils.R
knoiva-indecon Nov 8, 2023
b16031a
Update run_fredi.R
knoiva-indecon Nov 8, 2023
628cf75
Update aggregate_impacts.R
knoiva-indecon Nov 8, 2023
324d285
Updates to combine region & state-level data
knoiva-indecon Nov 9, 2023
bc9c9bc
Add state data import functionality to import_inputs
maddockw Nov 15, 2023
7152705
Initialized fixes to combined data code
knoiva-indecon Nov 16, 2023
65d927f
Fix to import_inputs
maddockw Nov 16, 2023
82b259c
Fix to import_inputs
maddockw Nov 20, 2023
344759c
fix to duplicate issue and some testing
tonygard-indecon Nov 29, 2023
1c5e3f7
fix econ adj value columns
tonygard-indecon Dec 1, 2023
17ed157
more fixes
tonygard-indecon Dec 1, 2023
fa919d2
Update utils.R
knoiva-indecon Dec 5, 2023
dd4bef8
Update utils.R
knoiva-indecon Dec 5, 2023
2a4a1d6
Merge pull request #115 from USEPA/state_level_initial_combined_kmn_b…
knoiva-indecon Dec 8, 2023
973fb11
Merge pull request #116 from USEPA/state_level_updates_wm
knoiva-indecon Dec 8, 2023
0c21106
Merge branch 'state_level_initial_kmn' into state_level_initial_combi…
knoiva-indecon Dec 8, 2023
23a1694
Merge pull request #117 from USEPA/state_level_initial_combined_kmn
knoiva-indecon Dec 8, 2023
0162dea
Merge pull request #118 from USEPA/maintanence_misc_hme
knoiva-indecon Dec 8, 2023
1783324
Merge branch 'state_level_initial_wm' into state_level_initial_kmn
knoiva-indecon Dec 8, 2023
9dd1ba7
Merge remote-tracking branch 'origin/maintenance_misc' into state_lev…
knoiva-indecon Dec 8, 2023
d693741
Merge pull request #119 from USEPA/state_level_initial_kmn
knoiva-indecon Dec 8, 2023
d0697c5
move fun_slrModel2Height to FrEDI_Data
tonygard-indecon Dec 11, 2023
5dce444
cleanup workflows
tonygard-indecon Dec 12, 2023
7a23b14
change description of workflow
tonygard-indecon Dec 12, 2023
40b0957
Merge pull request #120 from tonygard-indecon/gh-actions_tkg
knoiva-indecon Dec 12, 2023
e8cc5b2
Merge branch 'main' of github.com:USEPA/FrEDI into state_level_initial
tonygard-indecon Dec 13, 2023
7c949c8
creating data only branch on data_only_branch_state_initial
actions-user Dec 12, 2023
6c74c16
add new sysdata.rda from data_only_branch_state_initial
actions-user Dec 13, 2023
34d7ef3
make action use FrEDI build of current branch
tonygard-indecon Dec 13, 2023
67455da
quotation mark around branch name
tonygard-indecon Dec 13, 2023
13902ae
quotation mark around branch name
tonygard-indecon Dec 13, 2023
c6be2f9
creating data only branch on data_only_branch_state_initial
actions-user Dec 13, 2023
ee5d246
add new sysdata.rda from data_only_branch_state_initial
actions-user Dec 13, 2023
fddd704
creating data only branch on data_only_branch_state_initial
actions-user Dec 14, 2023
37ccd06
add new sysdata.rda from data_only_branch_state_initial
actions-user Dec 14, 2023
685eda5
make state_pop NA during National level aggregation
tonygard-indecon Dec 14, 2023
ae5cc01
make physcialmeasure NA during National level aggregation
tonygard-indecon Dec 14, 2023
239c8af
creating data only branch on data_only_branch_state_initial
actions-user Dec 15, 2023
deb7f94
add new sysdata.rda from data_only_branch_state_initial
actions-user Dec 15, 2023
94564d6
Merge branch 'state_level_initial' of github.com:USEPA/FrEDI into sta…
tonygard-indecon Dec 15, 2023
82cb856
Specified that data was in frediData$data
heaston-indecon Dec 15, 2023
5505849
seperate drop column conditionals from msg consitionals
tonygard-indecon Dec 15, 2023
da6baef
calc_tract_scaledInpacts function and fixed a missing pipe in run_fre…
heaston-indecon Dec 15, 2023
1c5a725
fix aggregation for national using existing column strings
tonygard-indecon Dec 15, 2023
0515666
Merge pull request #121 from USEPA/state_level_initial_tkg
knoiva-indecon Dec 15, 2023
bf652ea
Merge pull request #122 from USEPA/state_level_initial_fix_hme
knoiva-indecon Dec 15, 2023
35683e5
creating data only branch on data_only_branch_state_initial
actions-user Dec 15, 2023
7e44ed2
add new sysdata.rda from data_only_branch_state_initial
actions-user Dec 17, 2023
7d5f127
add directory create
tonygard-indecon Dec 18, 2023
097967c
add dome prints statements
tonygard-indecon Dec 18, 2023
1ae0855
add dome print/list statements
tonygard-indecon Dec 18, 2023
f8baca2
add recursive dir create
tonygard-indecon Dec 18, 2023
c0bca6a
add recursive dir create
tonygard-indecon Dec 18, 2023
f6aeeba
Fixed default groups in aggregate_impacts and started adding state le…
knoiva-indecon Dec 18, 2023
95b649f
Update utils_create_report_figures.R
knoiva-indecon Dec 18, 2023
52cbe77
Update create_DoW_results.R
knoiva-indecon Dec 18, 2023
dff8818
Update create_DoW_results.R
knoiva-indecon Dec 18, 2023
1bca60a
Update utils_plot_DOW_byImpactTypes.R
knoiva-indecon Dec 18, 2023
68c1e57
Update utils_plot_DOW_bySector.R
knoiva-indecon Dec 18, 2023
fb7b5ec
Update utils_create_report_figures.R
knoiva-indecon Dec 18, 2023
790596c
Update create_DoW_results.R
knoiva-indecon Dec 18, 2023
be72272
Merge pull request #123 from USEPA/state_level_initial_fixFigures_kmn
knoiva-indecon Dec 18, 2023
e6fb48a
Update run_fredi.R
knoiva-indecon Dec 18, 2023
6a98f0f
Update utils_plot_DOW_byImpactType.R
knoiva-indecon Dec 18, 2023
ab81d2f
creating data only branch on data_only_branch_state_code_initial
actions-user Dec 18, 2023
5cfec3f
add new sysdata.rda from data_only_branch_state_code_initial
actions-user Dec 18, 2023
fbcfe29
Merge pull request #124 from USEPA/state_level_initial_fixFigures_kmn
knoiva-indecon Dec 18, 2023
cde739e
Merge pull request #125 from USEPA/state_level_initial
knoiva-indecon Dec 18, 2023
024e338
creating data only branch on data_only_branch_state_code_initial
actions-user Dec 18, 2023
19f775e
add new sysdata.rda from data_only_branch_state_code_initial
actions-user Dec 18, 2023
ed481e4
creating data only branch on data_only_branch_state_initial
actions-user Dec 18, 2023
fc942b1
add new sysdata.rda from data_only_branch_state_initial
actions-user Dec 18, 2023
b40b72a
creating data only branch on data_only_branch_state_initial
actions-user Dec 19, 2023
9ccf7be
add new sysdata.rda from data_only_branch_state_initial
actions-user Dec 19, 2023
6733f18
creating data only branch on data_only_branch_state_initial_tkg
actions-user Dec 19, 2023
518a7e7
add new sysdata.rda from data_only_branch_state_initial_tkg
actions-user Dec 19, 2023
2b2a120
creating data only branch on data_only_branch_state_initial_tkg
actions-user Dec 19, 2023
0899784
add new sysdata.rda from data_only_branch_state_initial_tkg
actions-user Dec 19, 2023
eddc8f9
dircreate recursive = T
tonygard-indecon Dec 19, 2023
8071ca8
Merge branch 'state_level_initial_fixFigures' of https://github.com/U…
knoiva-indecon Dec 19, 2023
9495a8e
Merge pull request #127 from USEPA/state_level_initial_fixFigures
knoiva-indecon Dec 19, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/workflows/test_fredi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
Rscript -e '
devtools::install_github(
repo = "https://github.com/USEPA/FrEDI",
ref = "main",
ref = "${{ github.ref_name }}",
subdir = "FrEDI",
dependencies = FALSE,
upgrade = "never",
Expand Down Expand Up @@ -94,6 +94,11 @@ jobs:

### Test results
if(do_tests){

### Check if path exists and, if not, create it
exists0 <- oPath1 |> dir.exists()
if(!exists0){oPath1 |> dir.create(recursive = TRUE)}

### Run FrEDI
results0 <- run_fredi()
### Run tests
Expand All @@ -119,7 +124,8 @@ jobs:

### Check if path exists and, if not, create it
exists0 <- oPath2 |> dir.exists()
if(!exists0){oPath2 |> dir.create()}
if(!exists0){oPath2 |> dir.create(recursive = TRUE)}


### Create report figures
reports0 <- create_DoW_results(
Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/update_base_data.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Update Base System Data

on:
workflow_dispatch:
inputs:
fredi_data_branches:
type: string
description: Which data only branch of FrEDI_data to pull in data from? (i.e. data_only_branch_state_initial)


jobs:
get_data:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Commit results
run: |
git config --global user.email "[email protected]"
git config --global user.name "GitHub Actions"
git pull --depth=1 --ff https://github.com/USEPA/FrEDI_Data.git ${{ github.event.inputs.fredi_data_branches }} --allow-unrelated-histories
mv data/tmp_sysdata.rda FrEDI/R/sysdata.rda
git branch --show-current
git add FrEDI/R/sysdata.rda
git rm -r data
git pull origin ${{ github.head_ref }} --autostash --rebase -X ours
git status
git commit -am "add new sysdata.rda from ${{ github.event.inputs.fredi_data_branches }}"
git push
16 changes: 0 additions & 16 deletions FrEDI/.github/workflows/greetings.yml

This file was deleted.

2 changes: 1 addition & 1 deletion FrEDI/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ Depends: R (>= 3.5.0),
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
LazyData: TRUE
Suggests: knitr, rmarkdown, prettydoc, devtools
Suggests: knitr, rmarkdown, prettydoc, devtools, kableExtra
VignetteBuilder: knitr
Language: en-US
Loading