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 code #76

Merged
merged 252 commits into from
Feb 14, 2024
Merged
Changes from 1 commit
Commits
Show all changes
252 commits
Select commit Hold shift + click to select a range
01d8565
Merge branch 'main' into state_data_initial_wm
maddockw Oct 11, 2023
37fb653
Added state info to control tables in config file
maddockw Oct 11, 2023
7c0251a
Add helper functions for loading state data
maddockw Oct 12, 2023
fbffabc
Add state functionality to loadData
maddockw Oct 12, 2023
2efdedf
Update reshapeData and createSystemData with state functionality
maddockw Oct 13, 2023
a72c33e
Added state data for AirQuality and ATSExtremeTemp
maddockw Oct 13, 2023
ce4c5ca
Updated slr sector naming conventions for state data
maddockw Oct 13, 2023
44fd7ce
Updates to functions for loading and formatting state data
maddockw Oct 17, 2023
8907c4d
Added state population to configuration steps
maddockw Oct 17, 2023
b99b40e
Update configuration function handling of state data
maddockw Oct 24, 2023
32a42db
Update DESCRIPTION
knoiva-indecon Oct 25, 2023
1571b06
Edits to improve createSystemData outputs
knoiva-indecon Oct 25, 2023
1a2d233
Create configureSystemData.R
knoiva-indecon Oct 25, 2023
21901dd
Merge branch 'main' into state_data_initial_kmn_copy
knoiva-indecon Oct 25, 2023
10493a8
Merge pull request #43 from USEPA/state_data_initial_kmn
knoiva-indecon Oct 25, 2023
513bcc3
Update configureSystemData.R
knoiva-indecon Oct 25, 2023
36f127b
Update configureSystemData.R
knoiva-indecon Oct 25, 2023
6229da4
Update sysdata.rda
knoiva-indecon Oct 25, 2023
b9c8c48
Merge pull request #44 from USEPA/state_code_initial_kmn
knoiva-indecon Oct 25, 2023
445dda9
Merge pull request #45 from USEPA/state_code_initial
knoiva-indecon Oct 26, 2023
45e13fd
Fixed state-level scaled impacts
knoiva-indecon Oct 31, 2023
50bf986
Fixed code for state-level
knoiva-indecon Oct 31, 2023
21a49bd
Updated config utils to test state-level scaled impact plots
knoiva-indecon Oct 31, 2023
e32ffc7
Update reshapeData.R
knoiva-indecon Oct 31, 2023
d2f6e9c
Update tmp_sysdata.rda
knoiva-indecon Oct 31, 2023
db7d871
Merge pull request #46 from USEPA/state_code_initial_kmn
knoiva-indecon Oct 31, 2023
b313679
Merge branch 'state_code_initial' of https://github.com/USEPA/FrEDI_D…
tonygard-indecon Nov 1, 2023
65d4d31
allow for return of reshaped data as argument
tonygard-indecon Nov 2, 2023
08f9000
add state testing to general config tests
tonygard-indecon Nov 6, 2023
3a79144
add plots
tonygard-indecon Nov 6, 2023
3896cea
Initial fixes for FrEDI workflow
knoiva-indecon Nov 7, 2023
11ca65d
edit configureFrediData script
tonygard-indecon Nov 7, 2023
72ce6b1
Merge branch 'main' of https://github.com/USEPA/FrEDI_Data into state…
tonygard-indecon Nov 7, 2023
e91f8a7
add quotes to workflow
tonygard-indecon Nov 7, 2023
bf4c004
Update utils_state.R
knoiva-indecon Nov 8, 2023
81ed282
Update HTF_scaledimpacts.csv
knoiva-indecon Nov 8, 2023
9d19c4c
Update reshapeData.R
knoiva-indecon Nov 8, 2023
6bb8d3d
Update createSystemData.R
knoiva-indecon Nov 8, 2023
adf4699
Update tmp_sysdata.rda
knoiva-indecon Nov 8, 2023
40ca9fa
merge issue
tonygard-indecon Nov 8, 2023
d8c3bac
add set_names
tonygard-indecon Nov 8, 2023
a9d222e
Updated temporary system data and tests
tonygard-indecon Nov 8, 2023
c7bb6dd
Update utils_state.R
knoiva-indecon Nov 9, 2023
7e92bd5
Initialized SLR fix
knoiva-indecon Nov 13, 2023
a7fe9c5
Update createSystemData.R
knoiva-indecon Nov 13, 2023
5e4d584
Merge branch 'state_code_combined_kmn_branch' into state_code_combine…
knoiva-indecon Nov 13, 2023
95c654a
Added argument `extend_all`
knoiva-indecon Nov 14, 2023
a38f0d0
Merge branch 'state_code_combined_kmn' into state_code_combined_kmn_s…
knoiva-indecon Nov 14, 2023
ed2e3ca
add tag for current branch
tonygard-indecon Nov 14, 2023
b3d47c1
Initialized combined data fixes
knoiva-indecon Nov 16, 2023
943c7eb
Update mental health scalars
maddockw Nov 16, 2023
3166d52
Add state-level labor data
maddockw Nov 20, 2023
48c4f5d
Add labor, update AQ
maddockw Dec 5, 2023
51815f4
Merge pull request #47 from USEPA/state_initial_testing
maddockw Dec 5, 2023
b724b64
Updated temporary system data and tests
maddockw Dec 5, 2023
e7dc8ff
Testing AQ
maddockw Dec 5, 2023
142e3ae
Updated temporary system data and tests
maddockw Dec 5, 2023
dcefe8f
Quick fix for labor scalars
maddockw Dec 6, 2023
1d3fbaa
Revert "Quick fix for labor scalars"
maddockw Dec 6, 2023
521af11
Add Roads, Rail, Wind Damage, and Asphalt Roads
maddockw Dec 7, 2023
c3b41e5
Rename Wind Damage impacts file
maddockw Dec 7, 2023
7574a74
Fix to config file to import state-level scalars for Roads
maddockw Dec 7, 2023
225cf0d
Another fix for roads scalar matching
maddockw Dec 8, 2023
cf146d9
Removing region-level ..._proactive roads scalars
maddockw Dec 8, 2023
6d2eb14
Updated temporary system data and tests
maddockw Dec 8, 2023
cd716ef
Add Wildfire at state level
maddockw Dec 8, 2023
fcaff1c
Fix to scalars in config file
maddockw Dec 8, 2023
cce1445
Adjust scalars to match constant/dynamic designations
maddockw Dec 8, 2023
19680e5
Fixes for state level plots
knoiva-indecon Dec 8, 2023
4a98259
Merge pull request #49 from USEPA/state_code_combined_kmn_slrFix
knoiva-indecon Dec 8, 2023
2ab638c
Merge pull request #50 from USEPA/state_initial_testing
knoiva-indecon Dec 8, 2023
3849f8e
Merge pull request #51 from USEPA/state_data
knoiva-indecon Dec 8, 2023
1246e68
Merge pull request #52 from USEPA/state_code_initial_add_sectors
knoiva-indecon Dec 8, 2023
871ca06
Merge branch 'state_code_combined_kmn' into state_code_initial_kmn
knoiva-indecon Dec 8, 2023
be588e2
Update FrEDI_config.xlsx
knoiva-indecon Dec 8, 2023
3ff271f
Update FrEDI_config.xlsx
knoiva-indecon Dec 9, 2023
986571e
Removed wildfire state-level data
knoiva-indecon Dec 9, 2023
9b07865
Corrected variant ids in Rail, Roads state-level data
knoiva-indecon Dec 9, 2023
4093643
Update reshapeData.R
knoiva-indecon Dec 9, 2023
87d9930
Update configTests_utils.R
knoiva-indecon Dec 9, 2023
e59bb43
Added print lines for QCing
knoiva-indecon Dec 9, 2023
e8b3aa7
Update tmp_sysdata.rda
knoiva-indecon Dec 9, 2023
4808bdb
Removed some sectors
knoiva-indecon Dec 9, 2023
7c74de2
Merge pull request #54 from USEPA/state_code_combined_kmn
knoiva-indecon Dec 9, 2023
0e5a33f
Merge pull request #55 from USEPA/state_code_initial_kmn
knoiva-indecon Dec 9, 2023
de3e5d9
add fun_slrModel2Height
tonygard-indecon Dec 11, 2023
a62b469
define function package call
tonygard-indecon Dec 11, 2023
e7438c8
add getFromNamespace call for interpolate annual
tonygard-indecon Dec 12, 2023
95ed310
add getFromNamespace call for interpolate annual
tonygard-indecon Dec 12, 2023
7fd22fc
add getFromNamespace call for other functions
tonygard-indecon Dec 12, 2023
7e6b523
add getFromNamespace call for other functions
tonygard-indecon Dec 12, 2023
39bbca9
take out test for now
tonygard-indecon Dec 12, 2023
44bba0c
Updated temporary system data and tests
tonygard-indecon Dec 12, 2023
0dfdf5e
Updated temporary system data and tests
tonygard-indecon Dec 12, 2023
af0fee3
change argument for extend_all
tonygard-indecon Dec 12, 2023
db88b3c
Updated temporary system data and tests
tonygard-indecon Dec 12, 2023
7a02a39
change yea to true
tonygard-indecon Dec 13, 2023
76c9209
Merge branch 'state_code_initial' of https://github.com/USEPA/FrEDI_D…
tonygard-indecon Dec 13, 2023
7e58f50
more changes from yes to true
tonygard-indecon Dec 13, 2023
01a2afe
Merge branch 'state_code_initial' of https://github.com/tonygard-inde…
tonygard-indecon Dec 13, 2023
ec8f933
update sv data preparation
tonygard-indecon Dec 13, 2023
baff424
Updated temporary system data and tests
tonygard-indecon Dec 13, 2023
a418e89
fix true call
tonygard-indecon Dec 13, 2023
a6e446d
move sv update option out
tonygard-indecon Dec 13, 2023
35e2bf3
Updated temporary system data and tests
tonygard-indecon Dec 13, 2023
ba92c0f
update sysdata with sv data
tonygard-indecon Dec 13, 2023
798c512
Updated temporary system data and tests
tonygard-indecon Dec 13, 2023
31ce431
change default to add sv datalist to rds object
tonygard-indecon Dec 14, 2023
b5aeba5
Merge branch 'state_code_initial' of https://github.com/USEPA/FrEDI_D…
tonygard-indecon Dec 14, 2023
fd085ea
add admisc package
tonygard-indecon Dec 14, 2023
5cc7b9c
Updated temporary system data and tests
tonygard-indecon Dec 14, 2023
9607708
fix data path issue
tonygard-indecon Dec 15, 2023
e051c7e
Updated SV FrEDI data objects
tonygard-indecon Dec 15, 2023
41e6c5c
Updated SV FrEDI data objects
tonygard-indecon Dec 15, 2023
7ee0814
Update FrEDI_config.xlsx
knoiva-indecon Dec 15, 2023
a8fabb3
Merge pull request #58 from USEPA/state_code_initial_updateModelMaxVa…
knoiva-indecon Dec 15, 2023
ea17cda
change rds to rda
tonygard-indecon Dec 15, 2023
3f789a1
Updated temporary system data and tests
tonygard-indecon Dec 15, 2023
f37eea7
Updated SV FrEDI data objects
tonygard-indecon Dec 15, 2023
32d0fd2
Updated temporary system data and tests
tonygard-indecon Dec 15, 2023
5e738d7
Updated temporary system data and tests
knoiva-indecon Dec 15, 2023
2de7ff4
Added maxUnitValue
knoiva-indecon Dec 15, 2023
42809be
Update configureFrediData.R
knoiva-indecon Dec 15, 2023
c740d45
Merge branch 'state_code_initial' of https://github.com/USEPA/FrEDI_D…
tonygard-indecon Dec 15, 2023
fbdedcc
fix to allow for general config tests with combined data and reshaped…
tonygard-indecon Dec 16, 2023
638abc6
fix workflow boolean call
tonygard-indecon Dec 16, 2023
1ca931b
fix workflow boolean quote
tonygard-indecon Dec 16, 2023
7dd0497
fix workflow boolean parenthesis
tonygard-indecon Dec 16, 2023
1aa5b44
add reshape arg to configureFredidata
tonygard-indecon Dec 16, 2023
be0656f
Merge pull request #59 from USEPA/state_code_initial_dashedLinePlots_tkg
knoiva-indecon Dec 17, 2023
955eaef
Updated temporary system data and tests
knoiva-indecon Dec 17, 2023
802d426
Merge pull request #60 from USEPA/state_code_initial_dashedLinePlots
knoiva-indecon Dec 17, 2023
fc69218
Updated temporary system data and tests
knoiva-indecon Dec 17, 2023
10be4d7
Update FrEDI_config.xlsx
knoiva-indecon Dec 18, 2023
7e76e33
Merge pull request #61 from USEPA/state_code_initial_fixRoadsDamageAdj
knoiva-indecon Dec 18, 2023
8812ada
Updated temporary system data and tests
knoiva-indecon Dec 18, 2023
ff8c051
Updated temporary system data and tests
knoiva-indecon Dec 18, 2023
e61cd5f
Update configureFrediData.R
knoiva-indecon Dec 18, 2023
d28ed35
Merge pull request #62 from USEPA/state_code_initial_fixCompileData
knoiva-indecon Dec 18, 2023
70ca41d
Updated temporary system data and tests
knoiva-indecon Dec 18, 2023
c9f86fa
Drop reshaped items
knoiva-indecon Dec 19, 2023
90fbc90
Merge pull request #63 from USEPA/state_code_initial_fixCompileData
knoiva-indecon Dec 19, 2023
a2e90ca
Update configureFrediData.R
knoiva-indecon Dec 19, 2023
51777a2
Merge pull request #64 from USEPA/state_code_initial_fixCompileData
knoiva-indecon Dec 19, 2023
a4ef1f9
updates to remove rshape data and always run reshape tests
tonygard-indecon Dec 19, 2023
33cea63
Updated temporary system data and tests
tonygard-indecon Dec 19, 2023
6557934
Merge pull request #66 from USEPA/state_code_initial
knoiva-indecon Dec 19, 2023
6301e48
Updated temporary system data and tests
knoiva-indecon Dec 19, 2023
9328c4d
Changed sector names
knoiva-indecon Dec 19, 2023
7ebc421
Updated temporary system data and tests
knoiva-indecon Dec 19, 2023
a047015
Update FrEDI_config.xlsx
knoiva-indecon Dec 19, 2023
e471758
Merge branch 'state_code_initial_renameSectors' of https://github.com…
knoiva-indecon Dec 19, 2023
2029093
Update FrEDI_config.xlsx
knoiva-indecon Jan 5, 2024
934b328
Updated temporary system data and tests
knoiva-indecon Jan 5, 2024
75b1e24
Update createSVData.R
knoiva-indecon Jan 5, 2024
e76b93e
Update utils_sv.R
knoiva-indecon Jan 5, 2024
068a77c
Update utils_configure_sv.R
knoiva-indecon Jan 5, 2024
fc77c62
Fixed pipes
knoiva-indecon Jan 8, 2024
1f85cb7
Fixed some steps
knoiva-indecon Jan 8, 2024
a674607
Update utils_configure_sv.R
knoiva-indecon Jan 8, 2024
e555c74
Update utils_configure_sv.R
knoiva-indecon Jan 8, 2024
389bdcd
Update update_svImpactLists.R
knoiva-indecon Jan 8, 2024
6f99cbf
Fixed routine for svDataList in createSVData
knoiva-indecon Jan 8, 2024
d9e7e00
Update update_svDataObjects.R
knoiva-indecon Jan 8, 2024
06ce927
Deleted duplicate SV impact lists
knoiva-indecon Jan 8, 2024
dd3dcf4
Updated name for HTF in SV
knoiva-indecon Jan 8, 2024
7211506
Delete utils_sv.R
knoiva-indecon Jan 8, 2024
a02a415
Update utils_configure_sv.R
knoiva-indecon Jan 8, 2024
f1f1dbb
Updated SV FrEDI data objects
knoiva-indecon Jan 8, 2024
5c53c37
Update update_svImpactLists.R
knoiva-indecon Jan 8, 2024
f9a178d
Merge branch 'state_code_initial_updateSV' of https://github.com/USEP…
knoiva-indecon Jan 8, 2024
4a0cb89
Updated SV FrEDI impact lists for Air Quality - Childhood Asthma
knoiva-indecon Jan 9, 2024
db57b67
Updated SV FrEDI impact lists for Air Quality - Premature Mortality
knoiva-indecon Jan 9, 2024
dc79f9a
Updated SV FrEDI impact lists for Labor
knoiva-indecon Jan 9, 2024
3569196
Updated SV FrEDI impact lists for Extreme Temperature
knoiva-indecon Jan 9, 2024
cfb6036
Updated SV FrEDI impact lists for Roads
knoiva-indecon Jan 10, 2024
fa0e5cc
Updated SV FrEDI impact lists for Coastal Properties
knoiva-indecon Jan 10, 2024
132745b
Updated SV FrEDI impact lists for Transportation Impacts from High Ti…
knoiva-indecon Jan 10, 2024
0e561b0
Renamed state-level ATS Temp file
knoiva-indecon Jan 10, 2024
f3c584b
Updated temporary system data and tests
knoiva-indecon Jan 10, 2024
bf95fda
Fixed some plot parameters
knoiva-indecon Jan 10, 2024
8ab118b
Update configTests_utils.R
knoiva-indecon Jan 10, 2024
029f3cb
Update FrEDI_config.xlsx
knoiva-indecon Jan 10, 2024
4f46180
Updated temporary system data and tests
knoiva-indecon Jan 10, 2024
9da1b02
Delete FrEDI SV Graphics Template.xlsx
knoiva-indecon Jan 10, 2024
e8412ea
Merge pull request #69 from USEPA/state_code_initial_updateSV
knoiva-indecon Jan 10, 2024
00d0489
Update utils_configure_sv.R
knoiva-indecon Jan 10, 2024
46aaaba
Update update_fredi_data.yml
knoiva-indecon Jan 10, 2024
8dcdf50
Update update_fredi_data.yml
knoiva-indecon Jan 10, 2024
da5adcb
Update add_svData_to_sysdata.R
knoiva-indecon Jan 10, 2024
d9b7441
Update update_fredi_data.yml
knoiva-indecon Jan 10, 2024
43fce8e
Update update_sysdata.R
knoiva-indecon Jan 10, 2024
fcc8519
Changed function call for adding SV data to sysdata.rda
knoiva-indecon Jan 10, 2024
477562f
Update create_data_only_branch.yml
knoiva-indecon Jan 10, 2024
1a65700
Update update_fredi_data.yml
knoiva-indecon Jan 10, 2024
4795bf9
Updated sysdata and added SV data to sysdata
knoiva-indecon Jan 10, 2024
ec95044
Update update_fredi_data.yml
knoiva-indecon Jan 10, 2024
c336e64
Merge branch 'state_code_initial_fixSV' of https://github.com/USEPA/F…
knoiva-indecon Jan 10, 2024
bb7fc4e
Update update_fredi_data.yml
knoiva-indecon Jan 10, 2024
0bc8cc3
Update update_fredi_data.yml
knoiva-indecon Jan 10, 2024
335ff2a
Updated temporary system data and tests
knoiva-indecon Jan 10, 2024
b213ef6
Update update_fredi_data.yml
knoiva-indecon Jan 10, 2024
ccf75d2
Updated sysdata and added SV data to sysdata
knoiva-indecon Jan 10, 2024
e622402
Merge pull request #70 from USEPA/state_code_initial_fixSV
knoiva-indecon Jan 10, 2024
bebb164
Update update_fredi_data.yml
knoiva-indecon Jan 10, 2024
f4e2df2
Updated temporary system data and tests
knoiva-indecon Jan 10, 2024
518a46c
Updated sysdata and added SV data to sysdata
knoiva-indecon Jan 10, 2024
780ed59
Update update_fredi_data.yml
knoiva-indecon Jan 11, 2024
d78c285
Merge branch 'state_code_initial_fixSV' of https://github.com/USEPA/F…
knoiva-indecon Jan 11, 2024
da10a89
Update update_fredi_data.yml
knoiva-indecon Jan 11, 2024
125c30b
Updated temporary system data and tests
knoiva-indecon Jan 11, 2024
4100a27
Update update_fredi_data.yml
knoiva-indecon Jan 11, 2024
f7c5079
Update update_fredi_data.yml
knoiva-indecon Jan 11, 2024
45bafe5
Updated sysdata and added SV data to sysdata
knoiva-indecon Jan 11, 2024
8bfc271
Update update_fredi_data.yml
knoiva-indecon Jan 11, 2024
efb6aa2
Updated sysdata and added SV data to sysdata
knoiva-indecon Jan 11, 2024
965b2b1
Merge pull request #71 from USEPA/state_code_initial_fixSV_test
knoiva-indecon Jan 11, 2024
b11db14
Merge pull request #72 from USEPA/state_code_initial_fixSV
knoiva-indecon Jan 11, 2024
bbd5799
Update FrEDI_config.xlsx
knoiva-indecon Jan 26, 2024
ea63453
Added new state-level scaled impacts
knoiva-indecon Jan 26, 2024
60d581d
Added new state-level scalars
knoiva-indecon Jan 26, 2024
09a298d
Renamed suicide scaled impacts
knoiva-indecon Jan 26, 2024
84a2410
Added fix to plots
knoiva-indecon Jan 26, 2024
fd10db3
Updated temporary system data and tests
knoiva-indecon Jan 26, 2024
b72a2d2
Merge pull request #73 from USEPA/state_code_initial_renameSectors_ad…
knoiva-indecon Jan 26, 2024
29ed79f
Updated temporary system data and tests
knoiva-indecon Jan 26, 2024
4b3b545
Updated sysdata and added SV data to sysdata
knoiva-indecon Jan 26, 2024
a2f44c7
Updated SV impact lists
knoiva-indecon Jan 31, 2024
33efd35
Update update_svImpacts.yml
knoiva-indecon Feb 1, 2024
5f7c6d3
Update update_svImpacts.yml
knoiva-indecon Feb 1, 2024
e1cd00b
Update Air Quality - Mortality (All Causes), 65+.csv
knoiva-indecon Feb 1, 2024
1ff00ab
Update update_svImpacts.yml
knoiva-indecon Feb 1, 2024
8cba1ae
Update update_svImpacts.yml
knoiva-indecon Feb 1, 2024
4ca82dd
Updated SV FrEDI impact lists for Air Quality - Childhood Asthma
knoiva-indecon Feb 1, 2024
901c257
Updated SV FrEDI impact lists for Air Quality - Premature Mortality
knoiva-indecon Feb 1, 2024
218d9cc
Updated SV FrEDI impact lists for Extreme Temperature
knoiva-indecon Feb 1, 2024
f0dcf2f
Updated SV FrEDI impact lists for Labor
knoiva-indecon Feb 1, 2024
08531b7
Updated SV FrEDI impact lists for Roads
knoiva-indecon Feb 1, 2024
ce1aca8
Merge pull request #74 from USEPA/state_code_initial_renameSectors_up…
knoiva-indecon Feb 9, 2024
69c3124
Merge branch 'state_code_initial_renameSectors' into state_code_merge
knoiva-indecon Feb 13, 2024
c0d36a2
Added ElecSD to state-level sectors
knoiva-indecon Feb 13, 2024
432daaa
Updated temporary system data and tests
knoiva-indecon Feb 13, 2024
f774b7b
Updated temporary system data and tests
knoiva-indecon Feb 13, 2024
987f1fa
Added state-level rail
knoiva-indecon Feb 13, 2024
507be96
Updated temporary system data and tests
knoiva-indecon Feb 13, 2024
627248f
Merge branch 'main' into state_code_initial_renameSectors
knoiva-indecon Feb 13, 2024
74fc49b
Merge branch 'state_code_initial_renameSectors' into state_code
knoiva-indecon Feb 13, 2024
65600ca
Delete tmp_sysdata.rda
knoiva-indecon Feb 13, 2024
971cdd3
Updated temporary system data and tests
knoiva-indecon Feb 13, 2024
4ba8370
Updated sysdata and added SV data to sysdata
knoiva-indecon Feb 13, 2024
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
Prev Previous commit
Next Next commit
Updated temporary system data and tests
knoiva-indecon committed Dec 19, 2023
commit 6301e4844c07a644fd3c3aa4ff03b74642c6946f
Binary file modified data/tmp_sysdata.rda
Binary file not shown.
Binary file modified data_tests/generalConfig_testResults.xlsx
Binary file not shown.