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

State code #76

merged 252 commits into from
Feb 14, 2024
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Oct 11, 2023

  1. Configuration menu
    Copy the full SHA
    01d8565 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    37fb653 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2023

  1. Add helper functions for loading state data

    Also updated naming conventions in state data files to match new functions
    maddockw committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    7c0251a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fbffabc View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2023

  1. Configuration menu
    Copy the full SHA
    2efdedf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a72c33e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ce4c5ca View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. Configuration menu
    Copy the full SHA
    44fd7ce View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8907c4d View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. Configuration menu
    Copy the full SHA
    b99b40e View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2023

  1. Update DESCRIPTION

    Added some packages to DESCRIPTION and fixed indentations
    knoiva-indecon committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    32a42db View commit details
    Browse the repository at this point in the history
  2. Edits to improve createSystemData outputs

    Made small edits to loadData, reshapeData, and createSystemData to improve the outputs of createSystemData, particularly at the state-level
    knoiva-indecon committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    1571b06 View commit details
    Browse the repository at this point in the history
  3. Create configureSystemData.R

    Created wrapper function for configureSystemData.R
    knoiva-indecon committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    1a2d233 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    21901dd View commit details
    Browse the repository at this point in the history
  5. Merge pull request #43 from USEPA/state_data_initial_kmn

    State data initial
    knoiva-indecon authored Oct 25, 2023
    Configuration menu
    Copy the full SHA
    10493a8 View commit details
    Browse the repository at this point in the history
  6. Update configureSystemData.R

    Changed names for configureSystemData output list
    knoiva-indecon committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    513bcc3 View commit details
    Browse the repository at this point in the history
  7. Update configureSystemData.R

    Fixed some lines of code related to fredi_config
    knoiva-indecon committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    36f127b View commit details
    Browse the repository at this point in the history
  8. Update sysdata.rda

    Updated system data with region and state-level data
    knoiva-indecon committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    6229da4 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #44 from USEPA/state_code_initial_kmn

    State code initial kmn
    knoiva-indecon authored Oct 25, 2023
    Configuration menu
    Copy the full SHA
    b9c8c48 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. Merge pull request #45 from USEPA/state_code_initial

    State code initial
    knoiva-indecon authored Oct 26, 2023
    Configuration menu
    Copy the full SHA
    445dda9 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2023

  1. Fixed state-level scaled impacts

    Updated state-level scaled impacts so that model, variant, impact year, and impact type values would match appropriate values for reshaping and configuring data
    knoiva-indecon committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    45e13fd View commit details
    Browse the repository at this point in the history
  2. Fixed code for state-level

    Corrected steps in reshapeData for state-level processing.
    knoiva-indecon committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    50bf986 View commit details
    Browse the repository at this point in the history
  3. Updated config utils to test state-level scaled impact plots

    Updated config utils to test state-level scaled impact plots
    knoiva-indecon committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    21a49bd View commit details
    Browse the repository at this point in the history
  4. Update reshapeData.R

    Updated reshapeData to fix steps for reshaping scalarDataframe for state-level data
    knoiva-indecon committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    e32ffc7 View commit details
    Browse the repository at this point in the history
  5. Update tmp_sysdata.rda

    Updated temporary system data
    knoiva-indecon committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    d2f6e9c View commit details
    Browse the repository at this point in the history
  6. Merge pull request #46 from USEPA/state_code_initial_kmn

    State-level fixes
    knoiva-indecon authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    db7d871 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

  1. Configuration menu
    Copy the full SHA
    b313679 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2023

  1. Configuration menu
    Copy the full SHA
    65d4d31 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. Configuration menu
    Copy the full SHA
    08f9000 View commit details
    Browse the repository at this point in the history
  2. add plots

    tonygard-indecon committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    3a79144 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2023

  1. Initial fixes for FrEDI workflow

    Implemented fixes to get run_fredi in FrEDI repo to run successfully
    knoiva-indecon committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    3896cea View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    11ca65d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    72ce6b1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e91f8a7 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. Update utils_state.R

    Fixed issue with `loadStateScaledImpacts`: looking for files with a capital "I" in "scaledImpacts"
    knoiva-indecon committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    bf4c004 View commit details
    Browse the repository at this point in the history
  2. Update HTF_scaledimpacts.csv

    Fixed an issue with the label for the Reactive/Reasonable variant
    knoiva-indecon committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    81ed282 View commit details
    Browse the repository at this point in the history
  3. Update reshapeData.R

    Fixed issues with state-level data, particularly region values for df_defaultScenario, data_scaledImpacts and slrImpacts
    knoiva-indecon committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    9d19c4c View commit details
    Browse the repository at this point in the history
  4. Update createSystemData.R

    Changed some code related to fredi_config list
    Corrected function for extending SLR data (previously calling some function (?) called `extend_data`...now using `extend_slr`
    knoiva-indecon committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    6bb8d3d View commit details
    Browse the repository at this point in the history
  5. Update tmp_sysdata.rda

    Updated configured data
    knoiva-indecon committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    adf4699 View commit details
    Browse the repository at this point in the history
  6. merge issue

    tonygard-indecon committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    40ca9fa View commit details
    Browse the repository at this point in the history
  7. add set_names

    tonygard-indecon committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    d8c3bac View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    a9d222e View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2023

  1. Update utils_state.R

    Renamed "loadStateScaledImpacts" to "loadStateImpacts" in utils_state.R. Added functions to help combine state & region data
    In reshapeData: improved code for consistency between region & state-level data
    In createSystemData: Added steps to group initial sector results by region or state, depending on whether data is by state or by region
    In configureSystemData: Updated workflow to combine reshaped state & region data and then configure the combined data
    Updated tmp_sysdata.rda
    knoiva-indecon committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    c7bb6dd View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. Initialized SLR fix

    Initialized fix for SLR values
    knoiva-indecon committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    7e92bd5 View commit details
    Browse the repository at this point in the history
  2. Update createSystemData.R

    Initialized changes to creating initial results during configuration step
    knoiva-indecon committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    a7fe9c5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5e4d584 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. Added argument extend_all

    Added argument `extend_all` to createSystemData and configureSystemData functions to make it easier to change whether we extend all models or just some models when creating impact functions
    knoiva-indecon committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    95c654a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a38f0d0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ed2e3ca View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Initialized combined data fixes

    Initialized some fixes to the combined data branch
    These fixes fix some things and break others (national level scalars not processing correctly...not sure if it is on this side or the FrEDI code side)
    knoiva-indecon committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    b3d47c1 View commit details
    Browse the repository at this point in the history
  2. Update mental health scalars

    Added missing 2010 values for both MH scalars
    maddockw committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    943c7eb View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. Add state-level labor data

    maddockw committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    3166d52 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Add labor, update AQ

    maddockw committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    48c4f5d View commit details
    Browse the repository at this point in the history
  2. Merge pull request #47 from USEPA/state_initial_testing

    Pull in workflows
    maddockw authored Dec 5, 2023
    Configuration menu
    Copy the full SHA
    51815f4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b724b64 View commit details
    Browse the repository at this point in the history
  4. Testing AQ

    maddockw committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    e7dc8ff View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    142e3ae View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. Quick fix for labor scalars

    maddockw committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    dcefe8f View commit details
    Browse the repository at this point in the history
  2. Revert "Quick fix for labor scalars"

    This reverts commit dcefe8f.
    maddockw committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    1d3fbaa View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. Configuration menu
    Copy the full SHA
    521af11 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c3b41e5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7574a74 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. Configuration menu
    Copy the full SHA
    225cf0d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cf146d9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6d2eb14 View commit details
    Browse the repository at this point in the history
  4. Add Wildfire at state level

    maddockw committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    cd716ef View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    fcaff1c View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    cce1445 View commit details
    Browse the repository at this point in the history
  7. Fixes for state level plots

    Made fixes to test-related functions to create plots for combined region- and state-level data
    knoiva-indecon committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    19680e5 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #49 from USEPA/state_code_combined_kmn_slrFix

    Merging fix for SLR sectors, scaled impact plots for combined region- and state-level data
    knoiva-indecon authored Dec 8, 2023
    Configuration menu
    Copy the full SHA
    4a98259 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #50 from USEPA/state_initial_testing

    Merging initial state level testing workflow into initial code branch
    knoiva-indecon authored Dec 8, 2023
    Configuration menu
    Copy the full SHA
    2ab638c View commit details
    Browse the repository at this point in the history
  10. Merge pull request #51 from USEPA/state_data

    Merge pull request #45 from USEPA/state_code_initial
    knoiva-indecon authored Dec 8, 2023
    Configuration menu
    Copy the full SHA
    3849f8e View commit details
    Browse the repository at this point in the history
  11. Merge pull request #52 from USEPA/state_code_initial_add_sectors

    Add additional sectors to initial state code branch
    knoiva-indecon authored Dec 8, 2023
    Configuration menu
    Copy the full SHA
    1246e68 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    871ca06 View commit details
    Browse the repository at this point in the history
  13. Update FrEDI_config.xlsx

    Updated FrEDI config with additional SLR scalar info
    knoiva-indecon committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    be588e2 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2023

  1. Update FrEDI_config.xlsx

    Changed Excel ID for "No Adaptation" to "NoAdapt"
    Changed byState = 1 to byState = 0 for Wildfire (need to fix missing states for Response Cost impact type)
    knoiva-indecon committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    3ff271f View commit details
    Browse the repository at this point in the history
  2. Removed wildfire state-level data

    Removed data for Wildfire (need to correct missing states for wildfire "Response Costs" impact type)
    knoiva-indecon committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    986571e View commit details
    Browse the repository at this point in the history
  3. Corrected variant ids in Rail, Roads state-level data

    Corrected variant ids for reactive and proactive variants for Rail and Roads sectors to match values in control tables
    knoiva-indecon committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    9b07865 View commit details
    Browse the repository at this point in the history
  4. Update reshapeData.R

    Commented out print statement
    knoiva-indecon committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    4093643 View commit details
    Browse the repository at this point in the history
  5. Update configTests_utils.R

    Added line to only plot models present in data
    knoiva-indecon committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    87d9930 View commit details
    Browse the repository at this point in the history
  6. Added print lines for QCing

    Added statements for QCing
    knoiva-indecon committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    e59bb43 View commit details
    Browse the repository at this point in the history
  7. Update tmp_sysdata.rda

    Updated tmp_sysdata.rda with all sectors
    knoiva-indecon committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    e8b3aa7 View commit details
    Browse the repository at this point in the history
  8. Removed some sectors

    Removed sectors that have not yet been fully QCed at the state-level
    knoiva-indecon committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    4808bdb View commit details
    Browse the repository at this point in the history
  9. Merge pull request #54 from USEPA/state_code_combined_kmn

    State code combined
    knoiva-indecon authored Dec 9, 2023
    Configuration menu
    Copy the full SHA
    7c74de2 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #55 from USEPA/state_code_initial_kmn

    State code initial kmn
    knoiva-indecon authored Dec 9, 2023
    Configuration menu
    Copy the full SHA
    0e5a33f View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. Configuration menu
    Copy the full SHA
    de3e5d9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a62b469 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. Configuration menu
    Copy the full SHA
    e7438c8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    95ed310 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7fd22fc View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7e6b523 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    39bbca9 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    44bba0c View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    0dfdf5e View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    af0fee3 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    db88b3c View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. change yea to true

    tonygard-indecon committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    7a02a39 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    76c9209 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7e58f50 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    01a2afe View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ec8f933 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    baff424 View commit details
    Browse the repository at this point in the history
  7. fix true call

    tonygard-indecon committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    a418e89 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    a6e446d View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    35e2bf3 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    ba92c0f View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    798c512 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. Configuration menu
    Copy the full SHA
    31ce431 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b5aeba5 View commit details
    Browse the repository at this point in the history
  3. add admisc package

    tonygard-indecon committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    fd085ea View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5cc7b9c View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2023

  1. fix data path issue

    tonygard-indecon committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    9607708 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e051c7e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    41e6c5c View commit details
    Browse the repository at this point in the history
  4. Update FrEDI_config.xlsx

    Corrected model maxUnitValues and corrected file path issue in co_slrSectors
    knoiva-indecon committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    7ee0814 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #58 from USEPA/state_code_initial_updateModelMaxVa…

    …lues
    
    Update FrEDI_config.xlsx
    knoiva-indecon authored Dec 15, 2023
    Configuration menu
    Copy the full SHA
    a8fabb3 View commit details
    Browse the repository at this point in the history
  6. change rds to rda

    tonygard-indecon committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    ea17cda View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    3f789a1 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    f37eea7 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    32d0fd2 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    5e738d7 View commit details
    Browse the repository at this point in the history
  11. Added maxUnitValue

    Added maxUnitValue to plotting scaled impacts
    knoiva-indecon committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    2de7ff4 View commit details
    Browse the repository at this point in the history
  12. Update configureFrediData.R

    Added plots & tests back to configureFrediData step
    knoiva-indecon committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    42809be View commit details
    Browse the repository at this point in the history
  13. Merge branch 'state_code_initial' of https://github.com/USEPA/FrEDI_Data

     into state_code_initial_dashedLinePlots
    tonygard-indecon committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    c740d45 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2023

  1. Configuration menu
    Copy the full SHA
    fbdedcc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    638abc6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1ca931b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7dd0497 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1aa5b44 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2023

  1. Merge pull request #59 from USEPA/state_code_initial_dashedLinePlots_tkg

    Fixes to allow for reshapedata tests and combined data tests
    knoiva-indecon authored Dec 17, 2023
    Configuration menu
    Copy the full SHA
    be0656f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    955eaef View commit details
    Browse the repository at this point in the history
  3. Merge pull request #60 from USEPA/state_code_initial_dashedLinePlots

    State code initial dashed line plots
    knoiva-indecon authored Dec 17, 2023
    Configuration menu
    Copy the full SHA
    802d426 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fc69218 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. Update FrEDI_config.xlsx

    Changed Road damage adjustment for region level to "road_miles_and_pop"
    knoiva-indecon committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    10be4d7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7e76e33 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8812ada View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ff8c051 View commit details
    Browse the repository at this point in the history
  5. Update configureFrediData.R

    Edited code to drop reshape data objects from rDataList
    knoiva-indecon committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    e61cd5f View commit details
    Browse the repository at this point in the history
  6. Merge pull request #62 from USEPA/state_code_initial_fixCompileData

    Update configureFrediData.R
    knoiva-indecon authored Dec 18, 2023
    Configuration menu
    Copy the full SHA
    d28ed35 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    70ca41d View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2023

  1. Drop reshaped items

    Added additional steps to try to drop reshaped elements from rDataList
    knoiva-indecon committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    c9f86fa View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    90fbc90 View commit details
    Browse the repository at this point in the history
  3. Update configureFrediData.R

    Removed drop steps from the configure script
    knoiva-indecon committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    a2e90ca View commit details
    Browse the repository at this point in the history
  4. Merge pull request #64 from USEPA/state_code_initial_fixCompileData

    Update configureFrediData.R
    knoiva-indecon authored Dec 19, 2023
    Configuration menu
    Copy the full SHA
    51777a2 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a4ef1f9 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    33cea63 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #66 from USEPA/state_code_initial

    State code initial
    knoiva-indecon authored Dec 19, 2023
    Configuration menu
    Copy the full SHA
    6557934 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    6301e48 View commit details
    Browse the repository at this point in the history
  9. Changed sector names

    Changed sector labels and IDs for selected sectors:
    
    - For Air Quality, changed label from "Air Quality" to "Climate-Driven Changes in Air Quality"
    - For ATS Extreme Temp, changed ID from "ATSExtremeTemp" to "ATSTemp" and label from "ATS Extreme Temperature" to "ATS Temperature-Related Mortality"
    - For CIL Extreme Temp, changed ID from "CILExtremeTemp" to "CILTemp" and label from "CIL Extreme Temperature" to "CIL Temperature-Related Mortality"
    - For HTF, changed label from "High Tide Flooding and Traffic" to "Transportation Impacts from High Tide Flooding"
    - For Mental Health, changed ID from "MentalHealth" to "Suicide" and label from "Mental Health" to "Suicide"
    knoiva-indecon committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    9328c4d View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    7ebc421 View commit details
    Browse the repository at this point in the history
  11. Update FrEDI_config.xlsx

    Fixed references to old sector IDs in other control tables in config file
    knoiva-indecon committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    a047015 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    e471758 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2024

  1. Update FrEDI_config.xlsx

    Changed label for "Vibrio" to "Vibriosis"
    knoiva-indecon committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    2029093 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    934b328 View commit details
    Browse the repository at this point in the history
  3. Update createSVData.R

    Converted magrittr pipe operator to native pipe operator in createSVData.R
    knoiva-indecon committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    75b1e24 View commit details
    Browse the repository at this point in the history
  4. Update utils_sv.R

    Updated magrittr pipe operator with native pipe operator in utils_sv.R (need to check against utils_sv.R in FrEDI repo)
    knoiva-indecon committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    e76b93e View commit details
    Browse the repository at this point in the history
  5. Update utils_configure_sv.R

    Updated magrittR pipe operator to native pipe operator in utils_configure_sv.R
    knoiva-indecon committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    068a77c View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2024

  1. Fixed pipes

    Fixed pipes
    knoiva-indecon committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    fc77c62 View commit details
    Browse the repository at this point in the history
  2. Fixed some steps

    Fixed some steps (e.g., converting approximation outputs to data frames)
    knoiva-indecon committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    1f85cb7 View commit details
    Browse the repository at this point in the history
  3. Update utils_configure_sv.R

    Converted some magrittr pipe operators to native pipe
    knoiva-indecon committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    a674607 View commit details
    Browse the repository at this point in the history
  4. Update utils_configure_sv.R

    Converted remaining magrittr pipe operator to native pipe
    knoiva-indecon committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    e555c74 View commit details
    Browse the repository at this point in the history
  5. Update update_svImpactLists.R

    Updated to use "load_all()" to load functions
    knoiva-indecon committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    389bdcd View commit details
    Browse the repository at this point in the history
  6. Fixed routine for svDataList in createSVData

    Fixed issue in passing `svDataList` object to function `get_svImpactsList` (or loading that object from file)
    knoiva-indecon committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    6f99cbf View commit details
    Browse the repository at this point in the history
  7. Update update_svDataObjects.R

    Changed to load code using devtools::load_all function
    knoiva-indecon committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    d9e7e00 View commit details
    Browse the repository at this point in the history
  8. Deleted duplicate SV impact lists

    Deleted duplicate copies of SV impact lists in inst/extdata/sv/impactLists
    knoiva-indecon committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    06ce927 View commit details
    Browse the repository at this point in the history
  9. Updated name for HTF in SV

    Updated name for HTF in SV
    knoiva-indecon committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    dd3dcf4 View commit details
    Browse the repository at this point in the history
  10. Delete utils_sv.R

    Deleted duplicate utils_sv.R
    knoiva-indecon committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    7211506 View commit details
    Browse the repository at this point in the history
  11. Update utils_configure_sv.R

    Updated the SV impact list extrapolation limits to 30C and 1000m for GCM and SLR values, respectively
    knoiva-indecon committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    a02a415 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    f1f1dbb View commit details
    Browse the repository at this point in the history
  13. Update update_svImpactLists.R

    Fixed issue with argument call for createSVData
    knoiva-indecon committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    5c53c37 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    f9a178d View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. Configuration menu
    Copy the full SHA
    4a0cb89 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    db57b67 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    dc79f9a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3569196 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. Configuration menu
    Copy the full SHA
    cfb6036 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fa0e5cc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    132745b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0e561b0 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f3c584b View commit details
    Browse the repository at this point in the history
  6. Fixed some plot parameters

    Fixed some plot parameters since SLR sectors were not showing results
    knoiva-indecon committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    bf95fda View commit details
    Browse the repository at this point in the history
  7. Update configTests_utils.R

    Changed plot limits for SLR from [2010, 2090] to [2000, 2100]
    knoiva-indecon committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    8ab118b View commit details
    Browse the repository at this point in the history
  8. Update FrEDI_config.xlsx

    Changed refyear in co_slrScalars from 2090 to 2100 to match limits on underlying data
    knoiva-indecon committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    029f3cb View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    4f46180 View commit details
    Browse the repository at this point in the history
  10. Delete FrEDI SV Graphics Template.xlsx

    Delete FrEDI graphics template
    knoiva-indecon committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    9da1b02 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #69 from USEPA/state_code_initial_updateSV

    State code initial update sv
    knoiva-indecon authored Jan 10, 2024
    Configuration menu
    Copy the full SHA
    e8412ea View commit details
    Browse the repository at this point in the history
  12. Update utils_configure_sv.R

    Check if impact list file exists and, if it does, delete it and write over it.
    knoiva-indecon committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    00d0489 View commit details
    Browse the repository at this point in the history
  13. Update update_fredi_data.yml

    Changed string in text from "yes" to "true"
    knoiva-indecon committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    46aaaba View commit details
    Browse the repository at this point in the history
  14. Update update_fredi_data.yml

    Added step to add dependencies in YML
    knoiva-indecon committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    8dcdf50 View commit details
    Browse the repository at this point in the history
  15. Update add_svData_to_sysdata.R

    Changed way we load code
    knoiva-indecon committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    da5adcb View commit details
    Browse the repository at this point in the history
  16. Update update_fredi_data.yml

    Commented out YML to get package dependencies to run
    knoiva-indecon committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    d9b7441 View commit details
    Browse the repository at this point in the history
  17. Update update_sysdata.R

    Changed file to apply update to sysdata.rda and not tmp_sysdata.rda. Also converted magrittr pipe operator to native pipe operator
    knoiva-indecon committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    43fce8e View commit details
    Browse the repository at this point in the history
  18. Changed function call for adding SV data to sysdata.rda

    Converted "add_svData_to_sysdata.R" from script to a function
    knoiva-indecon committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    fcc8519 View commit details
    Browse the repository at this point in the history
  19. Update create_data_only_branch.yml

    Edited create_data_only_branch.yml to only add in .rda files (rather than all the SV data)
    knoiva-indecon committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    477562f View commit details
    Browse the repository at this point in the history
  20. Update update_fredi_data.yml

    Uncommented next steps in update_sysdata workflow.
    knoiva-indecon committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    1a65700 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    4795bf9 View commit details
    Browse the repository at this point in the history
  22. Update update_fredi_data.yml

    Test command change
    knoiva-indecon committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    ec95044 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    c336e64 View commit details
    Browse the repository at this point in the history
  24. Update update_fredi_data.yml

    Commented out commit
    knoiva-indecon committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    bb7fc4e View commit details
    Browse the repository at this point in the history
  25. Update update_fredi_data.yml

    Added git back into rm data/sysdata.rda
    knoiva-indecon committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    0bc8cc3 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    335ff2a View commit details
    Browse the repository at this point in the history
  27. Update update_fredi_data.yml

    Workflow seems to be working now. Adding commit back in.
    knoiva-indecon committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    b213ef6 View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    ccf75d2 View commit details
    Browse the repository at this point in the history
  29. Merge pull request #70 from USEPA/state_code_initial_fixSV

    State code initial fix steps to add SV data to sysdata.rda
    knoiva-indecon authored Jan 10, 2024
    Configuration menu
    Copy the full SHA
    e622402 View commit details
    Browse the repository at this point in the history
  30. Update update_fredi_data.yml

    Fixed issue with conditional for updating SV data. Commented out commit for testing
    knoiva-indecon committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    bebb164 View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    f4e2df2 View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    518a46c View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. Update update_fredi_data.yml

    Putting commit step back in
    knoiva-indecon committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    780ed59 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d78c285 View commit details
    Browse the repository at this point in the history
  3. Update update_fredi_data.yml

    Removing commit step
    knoiva-indecon committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    da10a89 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    125c30b View commit details
    Browse the repository at this point in the history
  5. Update update_fredi_data.yml

    Added commit step back in. Again!
    knoiva-indecon committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    4100a27 View commit details
    Browse the repository at this point in the history
  6. Update update_fredi_data.yml

    Converted git "cp" to bash command
    knoiva-indecon committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    f7c5079 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    45bafe5 View commit details
    Browse the repository at this point in the history
  8. Update update_fredi_data.yml

    Added step to remove tmp_sysdata.rda back in after successful action
    knoiva-indecon committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    8bfc271 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    efb6aa2 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #71 from USEPA/state_code_initial_fixSV_test

    State code initial fix sv test
    knoiva-indecon authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    965b2b1 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #72 from USEPA/state_code_initial_fixSV

    State code initial fix to add SV data to sysdata.rda data list. Also remove tmp_sysdata.rda copy of data
    knoiva-indecon authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    b11db14 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2024

  1. Update FrEDI_config.xlsx

    Updated control table with new state-level sectors. Updated physicalmeasure label
    knoiva-indecon committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    bbd5799 View commit details
    Browse the repository at this point in the history
  2. Added new state-level scaled impacts

    Added new state-level scaled impacts for Air Quality, Asphalt Roads, ElecTD, Urban Drainage, Wildfire, and Wind Damage
    knoiva-indecon committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    ea63453 View commit details
    Browse the repository at this point in the history
  3. Added new state-level scalars

    Added new state-level scalars for ElecTD, wildfire, asphalt roads
    knoiva-indecon committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    60d581d View commit details
    Browse the repository at this point in the history
  4. Renamed suicide scaled impacts

    Renamed suicide state-level scaled impacts to suicide from mental health (to match label in control tables)
    knoiva-indecon committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    09a298d View commit details
    Browse the repository at this point in the history
  5. Added fix to plots

    Added fix to scaled impact plots so that a plot for an impact type and region are created even if all values are NA. The plot will appear as a grey square. This fix was implemented for Wildfire.
    knoiva-indecon committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    84a2410 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    fd10db3 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #73 from USEPA/state_code_initial_renameSectors_ad…

    …dSectors3
    
    State code initial rename sectors add sectors3
    knoiva-indecon authored Jan 26, 2024
    Configuration menu
    Copy the full SHA
    b72a2d2 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    29ed79f View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    4b3b545 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2024

  1. Updated SV impact lists

    Updated SV impact lists with cold model extrapolation (waiting on Air Quality - Premature Mortality)
    knoiva-indecon committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    a2f44c7 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2024

  1. Update update_svImpacts.yml

    Fixed an issue with one of the inputs. Somehow the indenting got messed up??
    knoiva-indecon committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    33efd35 View commit details
    Browse the repository at this point in the history
  2. Update update_svImpacts.yml

    Commenting out action to get it to install dependencies
    knoiva-indecon committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    5f7c6d3 View commit details
    Browse the repository at this point in the history
  3. Update Air Quality - Mortality (All Causes), 65+.csv

    Updated SV impacts data for Air Quality - Premature Mortality
    knoiva-indecon committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    e1cd00b View commit details
    Browse the repository at this point in the history
  4. Update update_svImpacts.yml

    Trying to install FrEDI in action
    knoiva-indecon committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    1ff00ab View commit details
    Browse the repository at this point in the history
  5. Update update_svImpacts.yml

    Try updating impact lists
    knoiva-indecon committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    8cba1ae View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    4ca82dd View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    901c257 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    218d9cc View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    f0dcf2f View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    08531b7 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2024

  1. Merge pull request #74 from USEPA/state_code_initial_renameSectors_up…

    …dateSvImpacts
    
    State code initial rename sectors update sv impacts
    knoiva-indecon authored Feb 9, 2024
    Configuration menu
    Copy the full SHA
    ce1aca8 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2024

  1. Configuration menu
    Copy the full SHA
    69c3124 View commit details
    Browse the repository at this point in the history
  2. Added ElecSD to state-level sectors

    Manually added ElecSD to state-level sectors. Copied in state-level scalars and impacts. Edited main config file to specify ElecSD as a state-level sector
    knoiva-indecon committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    c0d36a2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    432daaa View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f774b7b View commit details
    Browse the repository at this point in the history
  5. Added state-level rail

    Added state-level rail data. Added state-level scalars and impacts. Updated sectors control table in config file.
    knoiva-indecon committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    987f1fa View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    507be96 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    627248f View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    74fc49b View commit details
    Browse the repository at this point in the history
  9. Delete tmp_sysdata.rda

    Deleted temporary sysdata file
    knoiva-indecon committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    65600ca View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    971cdd3 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    4ba8370 View commit details
    Browse the repository at this point in the history