Cleaned up input excel#481
Merged
Merged
Conversation
-removed redundant align_employment.xlsx and align_student_under30.xlsx -renamed alignmnet tragets .xlsx files and added info sheets to them; -renamed "policy parameters.xlsx" into "social_care_parameters" as it now contains only social care parameters - removed "UK_" prefix from the sheets in "time_series_factors.xlsx" - restructure "time_series_factors.xlsx" - split it to two excel files: "alignment_adjustment_series.xlsx" and "economic_time_series.xlsx" - the code was adjusted to reflect changes in the excel file names and structure
-the documentation has been updated accordingly
Contributor
There was a problem hiding this comment.
Pull request overview
This PR standardises SimPaths’ Excel-driven inputs by renaming/reshaping alignment target and time-series workbooks, removing legacy alignment wiring, and updating code + docs to reference the new file layout.
Changes:
- Updated
Parameterstime-series and alignment-target loaders to use the renamed/split workbooks (e.g.,economic_time_series.xlsx,alignment_adjustment_series.xlsx,alignment_targets_*.xlsx,social_care_parameters.xlsx). - Removed legacy “employment alignment” target plumbing from the Java model/enums.
- Updated Stata target-generation scripts and documentation, including adding “Info” metadata sheets to regenerated target workbooks.
Reviewed changes
Copilot reviewed 11 out of 24 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
src/main/java/simpaths/model/SimPathsModel.java |
Removes legacy employment-alignment procedure from the model. |
src/main/java/simpaths/model/enums/TimeSeriesVariable.java |
Removes the EmploymentAlignment time-series variable enum entry. |
src/main/java/simpaths/data/Parameters.java |
Switches loaders to new workbook names/sheet names and removes unused legacy alignment maps/getters. |
input/DoFilesTarget/90_person_risk_employment_stats.do |
Adds a new Stata script to generate person-level risk/employment diagnostics CSV. |
input/DoFilesTarget/03b_calculate_partnership_target.do |
Renames partnered-share target workbook output and adds an Info metadata sheet. |
input/DoFilesTarget/03a_calculate_partneredShare_initialPop_BUlogic.do |
Renames partnered-share target workbook output and adds an Info metadata sheet. |
input/DoFilesTarget/02_inSchool_targets_initpopdata.do |
Renames in-school target workbook output and adds an Info metadata sheet. |
input/DoFilesTarget/01_employment_shares_initpopdata.do |
Renames employment-target workbook output and adds an Info metadata sheet. |
documentation/wiki/overview/parameterisation.md |
Updates the list of alignment-target workbooks to the new alignment_targets_* naming. |
documentation/wiki/developer-guide/repository-guide.md |
Updates repository guide references for renamed inputs/outputs (script table needs correction). |
documentation/repository-guide.md |
Updates repository guide references for renamed inputs/outputs (script table needs correction). |
CLAUDE.md |
Updates the documented inflation-series workbook/sheet reference to the new economic time series file. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+362
to
366
| | `01_employment_shares_initpopdata.do` | `input/alignment_targets_employment.xlsx` — employment shares by benefit-unit subgroup and year | | ||
| | `01_inSchool_targets_initpopdata.do` | `input/alignment_targets_inSchool.xlsx` — school participation rates by year | | ||
| | `03_calculate_partneredShare_initialPop_BUlogic.do` | `input/alignment_targets_partnered_share.xlsx` — partnership shares by year | | ||
| | `03_calculate_partnership_target.do` | Supplementary partnership targets | | ||
| | `02_person_risk_employment_stats.do` | `employment_risk_emp_stats.csv` — person-level at-risk diagnostics used for employment alignment group construction | |
Collaborator
Author
There was a problem hiding this comment.
Hi @dav-sonn, yes, thank you for the review - I have committed the suggested changes.
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This branch cleans up and standardises the Excel input files. Redundant legacy alignment files were removed, alignment target workbooks were renamed with clearer alignment_targets_* names, and metadata Info sheets were added to regenerated alignment target files. The old time_series_factors.xlsx structure was split into separate economic and alignment-adjustment series files, with sheet names simplified by removing the UK_ prefix. Finally, policy parameters.xlsx was renamed to social_care_parameters.xlsx to reflect its current contents. Code and documentation references were updated to match the new file names and structure.