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

Merging main branch into state level #95

Merged
merged 52 commits into from
Oct 11, 2023
Merged

Merging main branch into state level #95

merged 52 commits into from
Oct 11, 2023

Conversation

knoiva-indecon
Copy link
Collaborator

No description provided.

knoiva-indecon and others added 30 commits October 4, 2023 17:36
Initialized code for testing FrEDI
Deleted createSystemData since it is no longer required
…hey can be imported from namespace eventually)
Edited fun_limitsByGroup to work for sector-only grouping
Edited get_sector_plotInfo to work for sector-only grouping
Added Y Title, simplified plot code
Added Y Title, simplified plot grid code
Added sector list to scenario code. Edited get_ciraDataObject to be able to be used in nonFrEDI packages.
Updated report figures to test out create_DoW_results function
Moved SLR scenarios figure
Turned script for creating report figures into a function, create_DoW_results
Edited description: removed dplyr, ggplot2, tidyr (which are included in tidyverse)
Added ggpubr (which is required for plotting)
Added devtools to suggested packages
Renamed create_report_figures and added argument to return the data and plot list
Added code for whether to load the image code from source, package, or project
Changed function pipe to %>%
Added code to specify how to load the image code
Moved greetings GitHub action and initialized actions to build and test FrEDI
Added ORCID IDs for IEc contributers
File "utils_create_report_figures.R":
- Created function `create_fig_scale_note` to create a note for multiple impact types

File: "utils_plot_DOW_byImpactTypes.R":
- Made note on impact type contingent on multiple impact types and variants

File: "create_DoW_results.R":
- Set default loadCode to "project"
Deleted files with a reference year of 2050...not applicable to appendix figures
File "utils_report_figures_scales":
- If nRow = 0, nRow = 1
File "utils_report_figures_format_sector_names.R":
- Created function `repCollapse` to repeat a new line a certain number of times and then collapse it
- Changed extra lines to be added all at beginning of sector name
File "utils_create_report_figures.R"
- Changed functions `sum_impacts_by_DoW` and `sum_impacts_by_DoW_years` and `get_fig7_slrImpacts` to take argument `aggOnly` to determine whether to only include sectors in Figure 7 for which `includeaggregate==1`
- Changed function `plot_DoW_by_modelYear` to remove lines of code factoring sectors for labeling...moved lines of code to `utils_plot_DOW_byImpactTypes`
- Moved formatting of sector names into `utils_plot_DOW_byModelType`
- Fixed years for which plots are printed for Fig7 and appendix figures
@knoiva-indecon knoiva-indecon merged commit bb5ba2a into state_level Oct 11, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants