Skip to content

Merge new estimates into develop#373

Merged
dav-sonn merged 139 commits intodevelopfrom
new_estimates
Mar 6, 2026
Merged

Merge new estimates into develop#373
dav-sonn merged 139 commits intodevelopfrom
new_estimates

Conversation

@dav-sonn
Copy link
Collaborator

@dav-sonn dav-sonn commented Mar 6, 2026

new_estimates is the branch where all the changes for the new release were made.

Mariia-Var and others added 30 commits January 24, 2026 17:09
-added Education testing into `PersonTest.java`
-added appropriate resetting of `eduLeaveSchoolFlag` and `eduExitSampleFlag`
-inSchoolAlignment was missing the necessary student share targets (they're now added into `policy parameters.xlsx`)
-updated `time_series_factor.xlsx` to include "UK_students_adjustment"
-aaded resetting of the `eduLeaveSchoolFlag` into `leavingSchool()`
-added updated of the `eduExitSampleFlag`
…the EU models as part of the ESPON project which is now closed
-ensure ACMales, ACFemales and SingleDepMlaes, SingleDepFemales employment rates are aligned correctly
…ntAlignment

Made necessary updates to the employment alignment
eduHighestC4
demPartnerStatus
- Update of the README.md file
- Sort the codebook in alphabetical order
- Remove sIndex and sIndexNormalised
- Rename lifetimeIncome --> yLifeTime, according to the new naming convention
…the JAS-MINE core already update regression coefficient during employment alignment, hence I remove refreshLabourSupplyUtilityRegression(...) method in the Parameters class.
… little bit

  - Employment alignment now warm-starts from previous year’s solved adjustment when year > startYear; otherwise it uses current-year configured value.
  - Added inline comments explaining purpose and behaviour.
Mariia-Var and others added 13 commits March 5, 2026 09:39
-updated inSchool and Partnership target inline with new initial populations
-Partnership targets are now loaded from partnered_share_targets.xlsx.
-inSchoolAlignment, PartnershipAlignment, FertilityAlignment now use last year Adjustment parameter for a start and also even when alignment process ends (e.g, after 2023 due to lack of target data), the relevant processes (inSchool, Partnership, Fertility) apply this "frozen" adjustment parameter.
-adjusted RootSearch exit parameters
…V-correct-alignments

Updated alignment details
This is the branch to be used for the release. The PCM estimates must be used on a separate one.
…S_EmpAlign_Check

Updated employment alignment targets file, employment_targets.xlsx
Resampling: off
Population alignment: on (from year 0)
Cohabitation alignment: on (from year 1)
All other  alignments off
…V-fix-small-bug-partneredTarget

Fixed a small bug in partnership targets
Update training populations
Issue at the DB building phase with the previous setting (private boolean useWeights = true).
@dav-sonn dav-sonn self-assigned this Mar 6, 2026
@dav-sonn dav-sonn merged commit 00fe839 into develop Mar 6, 2026
6 checks passed
@dav-sonn dav-sonn deleted the new_estimates branch March 13, 2026 15:23
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.

7 participants