Various updates - #514
Merged
Merged
Conversation
This commit restores the default simulation configuration to a shorter 2019-2022 run with a 50k population. It updates the codebook spreadsheet inputs. It also cleans up the wealth statistics schema by removing the legacy equivalised disposable income alias and renaming the S-index median field to match the codebook. Obsolete partner education enum entries were removed from Person, and the collector logic was updated to stop writing the legacy median-income output.
Contributor
There was a problem hiding this comment.
Pull request overview
This pull request restores the default simulation run configuration to a shorter 2019–2022 horizon with a smaller population, and aligns the wealth/income statistics outputs with the updated codebook by removing legacy/duplicate fields and renaming the S-index median output.
Changes:
- Shorten
config/default.ymldefault run period (2019–2022) and reduce default population size (50k). - Remove legacy
edi_p50output and rename S-index median field tostatSIndexP50inWealthIncomeStatistics. - Remove obsolete partner-education enum entries from
Person.DoublesVariablesand stop writing the legacy median-income alias in the collector.
Reviewed changes
Copilot reviewed 4 out of 7 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| src/main/java/simpaths/model/Person.java | Removes obsolete partner-education enum entries from DoublesVariables. |
| src/main/java/simpaths/experiment/SimPathsCollector.java | Stops writing the legacy edi_p50 median-income alias (but still triggers EDI calculation path). |
| src/main/java/simpaths/data/statistics/WealthIncomeStatistics.java | Removes edi_p50 field/accessors and renames S-index median output field/column. |
| config/default.yml | Restores default run settings to 2019–2022 with a 50k population. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
+463
to
+466
| var hh_edi_cs = new CrossSection<>(model::getBenefitUnits, BenefitUnit::getEquivalisedDisposableIncomeYearly); | ||
| var hh_edi_stats = new Stats(hh_edi_cs.get()).descrStats(); | ||
| wealthIncomeStats.setEdi_p50(hh_edi_stats.getPercentile(50.0)); | ||
| // Median equivalised household disposable income is already reported as yHhDispEquivP50. | ||
| // The legacy edi_p50 alias has been removed to keep the output consistent with the codebook. |
Comment on lines
+50
to
+54
| //Equivalised disposable income is reported as the income median yHhDispEquivP50; | ||
| //the legacy edi_p50 alias is intentionally removed to match the codebook naming rules. | ||
|
|
||
| //Percentiles of SIndex: | ||
| @Column(name = "SIndex_p50") | ||
| private double sIndex_p50; | ||
| @Column(name = "statSIndexP50") |
Drops the unused `EDI` collector wiring from `SimPathsCollector` and removes the legacy `edi_p50` output alias. The integration-test expected `WealthIncomeStatistics.csv` header is updated accordingly, including the standardized `statSIndexP50` naming and revised column layout to match current codebook-aligned output.
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 commit restores the default simulation configuration to a shorter 2019-2022 run with a 50k population. It updates the codebook spreadsheet inputs. It also cleans up the wealth statistics schema by removing the legacy equivalised disposable income alias and renaming the S-index median field to match the codebook. Obsolete partner education enum entries were removed from Person, and the collector logic was updated to stop writing the legacy median-income output.