Update structures for UC implementation - #519

Closed

andrewbaxter439 wants to merge 223 commits into

Commits on Mar 12, 2025

added benefits uc/nonuc lagged/nonlagged getters/setters
andrewbaxter439
committed
15eb5f7
added enums calling getters for uc/nonuc
andrewbaxter439
committed
eb750db
safe check if benefit lags are null
andrewbaxter439
committed
a78188b
set benefit receipt lags at baseline value in intialisation
andrewbaxter439
committed
f70539b
setting UC/nonUC flags at initial population matching
andrewbaxter439
committed
d18b4bf
update lagged variables
andrewbaxter439
committed
60b4906
added uc receipt to babies
andrewbaxter439
committed
1a1e980
added `bsauc_s` to EUROMOD input
andrewbaxter439
committed
8202b5c
temp UC setting method - all receive UC
andrewbaxter439
committed
27feb6e
fixed variable names
andrewbaxter439
committed
9cd9f74
extra line to gitignore
andrewbaxter439
committed
57fd2c5

Commits on Mar 25, 2025

Merge branch 'develop' into feature/uc-effects-mental-health
andrewbaxter439
committed
d1ad5fe
extract MCS2 load parameters to distinct function
andrewbaxter439
committed
4f137a2
added a test class of person with an ID
andrewbaxter439
committed
abb97bb
added a test class of Benefit Unit with id
andrewbaxter439
committed
c082b77
added settters for some benefit unit attrs
andrewbaxter439
committed
c799984
added MCS2 tests to PersonTest
andrewbaxter439
committed
5796e78
Added person enums for UC receipt by hours
andrewbaxter439
committed
d682a66
updated MCS2 sheets with additional UC elements
andrewbaxter439
committed
9fdcd37
column names for MCS to include UC params
andrewbaxter439
committed
0253cd8
update person MCS tests to include UC effects
andrewbaxter439
committed
0e9f633
add markers of benefit receipt to read from initial files
andrewbaxter439
committed
6424540

Commits on Mar 26, 2025

tidied person tests
andrewbaxter439
committed
fe10e5d

Commits on Mar 28, 2025

Updated Person test class with seed passed to Innovation object
andrewbaxter439
committed
5421811
updated PersonTest with new test person object
andrewbaxter439
committed
1511cd5
Three successful non-UC MCS tests
andrewbaxter439
committed
60a2514
added passing tests for UC MCS effects
andrewbaxter439
committed
6a4e59a
add a UC rollout flag and temporary logic
andrewbaxter439
committed
76f8d14
Update src/main/java/simpaths/model/BenefitUnit.java

andrewbaxter439
and
Copilot
authored
ef8f743

Commits on Apr 4, 2025

added dummy columns for UC effects for all outcomes
andrewbaxter439
committed
2505c26

Commits on Apr 14, 2025

UC flat effects applied with working tests - MCS
andrewbaxter439
committed
f594d34
added legacy benefit parameters to setup readin
andrewbaxter439
committed
a941622
updating legacy benefit and UC receipt from donor population
andrewbaxter439
committed
abfc816
new health statistics file
andrewbaxter439
committed
932a30b
receives benefit flags default to zero
andrewbaxter439
committed
19da4d8
add health stats calls to collector
andrewbaxter439
committed
ead5d7d
update benefit receipt across benefit units
andrewbaxter439
committed
b209685
fuller health stats calculations
andrewbaxter439
committed
c043ec1
alternative UC receipt detection
andrewbaxter439
committed
86db1a4
Merge branch 'experimental/parameter_parsing' into feature/uc-effects-mental-health
andrewbaxter439
committed
66d0d16
make uc_rollout not final so able to change
andrewbaxter439
committed
9bbd2c6
config file for no UC rollout
andrewbaxter439
committed
4ea3d0b
update start year to 2019 in github actions
andrewbaxter439
committed
9a9a346

Commits on Apr 15, 2025

change github actions to not use irrelevant policy files
andrewbaxter439
committed
2f2051f
add qaly and wellby calcs
andrewbaxter439
committed
4865c2c
parse config files at start of run to set most parameters
andrewbaxter439
committed
7410fcb
config files for UC on and off runs
andrewbaxter439
committed
94c3c37
change spelling mistake
andrewbaxter439
committed
30027af
attempt correct yml files
andrewbaxter439
committed
cd26d33
flagging temp code in DonorTaxImputation
andrewbaxter439
committed
bba8f13

Commits on Apr 16, 2025

switch eq5d process to end of year
andrewbaxter439
committed
bcf65bf

Commits on Jun 3, 2025

Merge branch 'develop' into feature/uc-effects-mental-health
andrewbaxter439
committed
176ee37
removed repeated code
andrewbaxter439
committed
1c73cfd
Update src/main/java/simpaths/experiment/SimPathsCollector.java

andrewbaxter439
and
Copilot
authored
5f6efbe
Update src/main/java/simpaths/model/Person.java

andrewbaxter439
and
Copilot
authored
4148ff5
remove excess config files
andrewbaxter439
committed
586a850
default UC off
andrewbaxter439
committed
5820d21
Merge remote-tracking branch 'sphsu-origin/feature/uc-effects-mental-health' into feature/uc-effects-mental-health
andrewbaxter439
committed
23d8d3d
add `bsauc_s` dummy to training data 2011-2013
andrewbaxter439
committed
f76be91
new validation health statistics
andrewbaxter439
committed
b92d774
remove repeated health statistics collection calls
andrewbaxter439
committed
909f371

Commits on Jun 20, 2025

change employment draws to lifetime
andrewbaxter439
committed
3a3b24f
Adding labour supply persistence probability
andrewbaxter439
committed
dd9399c
Allow labour supply persistence from prev year at set probability
andrewbaxter439
committed
3a7fc42
revert to old labour supply model (pre Jun 2024)
andrewbaxter439
committed
a46cc85
Add differential probability by employment
andrewbaxter439
committed
5ddcd57
update reg files for mcs pcs ls
andrewbaxter439
committed
60d3e81
fixed innovations assignment logic
andrewbaxter439
committed
f77e6bd
trial fix - set bsauc to zero in early years
andrewbaxter439
committed
5b58e48

Commits on Jun 23, 2025

Merge branch 'experimental/73-selecting-specific-input-folder' into experimental/uc_interim_setup
andrewbaxter439
committed
e4c756f
set user-specific temp folder
andrewbaxter439
committed
db1e17f
updated statistics check files
andrewbaxter439
committed
edb0eaf
correct finding of previous country from excel file
andrewbaxter439
committed
bdefb80
persist employment statistics to true
andrewbaxter439
committed
d8e38ab
uc run config files
andrewbaxter439
committed
51df0ce
added age group filtering to HealthStatistics
andrewbaxter439
committed
4a09dfb
Merge remote-tracking branch 'sphsu-origin/experimental/uc_interim_setup' into experimental/uc_interim_setup
andrewbaxter439
committed
9daeae8
add employment filter
andrewbaxter439
committed
92b7a86
add hours worked to employment statistics
andrewbaxter439
committed
1d472c6

Commits on Jun 24, 2025

added employment age gender filter
andrewbaxter439
committed
9240c29
added scenario label parameter
andrewbaxter439
committed
b03d830
updated employment statistics for subgroups
andrewbaxter439
committed
31c88e2
added scenario label to health statistics outputs
andrewbaxter439
committed
a6459e6
fixing some statistics filters
andrewbaxter439
committed
2dfda63
tidying filters
andrewbaxter439
committed
48e9ab3
add scenarios to uc yamls
andrewbaxter439
committed
4962c6b
add counts and prop on benefits to employmetn statistics
andrewbaxter439
committed
4b13768
add scenario and key setters to health statistics
andrewbaxter439
committed
09410d4
experimental - setting keys for differing stats outs
andrewbaxter439
committed
3d1e2b1
set statistics to produce multiple files
andrewbaxter439
committed
b35a611
added (not working) household stats file
andrewbaxter439
committed
04b64ba
correct household structure
andrewbaxter439
committed
6462876

Commits on Sep 6, 2025

Merge branch 'develop' into feature/uc-effects-mental-health
andrewbaxter439
committed
509a2f8

Commits on Dec 11, 2025

Merge branch 'develop' into feature/uc-effects-mental-health
andrewbaxter439
committed
cfaa4a0
temp remove MCS test
andrewbaxter439
committed
aea04d1
updating params to new code
andrewbaxter439
committed
da1f252

Commits on Jan 6, 2026

ignored database country year excel file
andrewbaxter439
committed
971310c
added labour by UC enums and case statements
andrewbaxter439
committed
179e7b7
add getter for liwwh
andrewbaxter439
committed
671050d
added case statements for Liwwh
andrewbaxter439
committed
649ecf1
new method for UC linked benefit combinations
andrewbaxter439
committed
820b142
uc_takeup getters and setters
andrewbaxter439
committed
edf221a
new probs calculation methods for Triple with UC param
andrewbaxter439
committed
f2d1ce5
new method for labour supply with UC on/off
andrewbaxter439
committed
bf01cd0
implement UC update method
andrewbaxter439
committed
a2d1817
add missing regressor MaleLeisure_UKI
andrewbaxter439
committed
fb03581
add uc takeup to employment statistics
andrewbaxter439
committed
89be3ee
add uc stats to employment statistics
andrewbaxter439
committed
3958598
uc updates on for individuals
andrewbaxter439
committed
2cadf11
attempt labour supply match for UC
andrewbaxter439
committed
1ec2a70
add benefit graphs
andrewbaxter439
committed
5102578
added skeleton validator tests
andrewbaxter439
committed
0d916d0
updated validator and test
andrewbaxter439
committed
0e198c4
fixed tests
andrewbaxter439
committed
95a77a8
refactored loading parameters and validation statistics
andrewbaxter439
committed
9c9946e
add legacy benefit indicator to initial population
andrewbaxter439
committed
7654704
LB flags for legacy benefit receipt
andrewbaxter439
committed
c6503fd
reset filtered pool on iterations
andrewbaxter439
committed
c6b5063
intermediate

justin-ven
authored and
andrewbaxter439
committed
5eab1d0
update tax function for UC
andrewbaxter439
committed
1434174
added uc config file
andrewbaxter439
committed
e374a90
ignore fulelr files
andrewbaxter439
committed
559d863
add option to write log files but keep console output
andrewbaxter439
committed
5ad03c5
add legacy benefit receipt enum
andrewbaxter439
committed
4a368d1
switch labour supply uc calculations to end
andrewbaxter439
committed
0530a42
setting UC and LB receipt more consistently
andrewbaxter439
committed
a0809b7
remove UC pool filtering
andrewbaxter439
committed
1e40248
amend config file dates
andrewbaxter439
committed
1f4f9d1
non-null calling of receives LB
andrewbaxter439
committed
fb50e4c
calculating LB and UC amounts
andrewbaxter439
committed
9d70313
testing that UC receipt is propagated from BU to Person
andrewbaxter439
committed
29d3b90
expand employment statistics GUI parameter
andrewbaxter439
committed
617c486
add resetting of input directory to person test eq5d tests
andrewbaxter439
committed
0221e76
added new person enums for mental health scoring
andrewbaxter439
committed
1f64fd3
sub dot for dot01
andrewbaxter439
committed
be58ba9
update test files to always run as training
andrewbaxter439
committed
f6ec1c6
update donor populations to include uc_takeup
andrewbaxter439
committed
00a85ee
add no direct effects option
andrewbaxter439
committed
373b616
chnge to dot01
andrewbaxter439
committed
3e1972f
tidy no effect yaml
andrewbaxter439
committed
6059437
correct config
andrewbaxter439
committed
2ae06ed
legacy benefit run file
andrewbaxter439
committed
3834cfc
uc_no_lsu config
andrewbaxter439
committed
a894660
fix yaml files
andrewbaxter439
committed
b338911
update gitignore to get it to stop bothering me
andrewbaxter439
committed
65a7145
added age group filtering to HealthStatistics
andrewbaxter439
committed
fd4bf77
add hours worked to employment statistics
andrewbaxter439
committed
5a78904
updated employment statistics for subgroups
andrewbaxter439
committed
af6143b
tidying filters
andrewbaxter439
committed
3f90c4f
add counts and prop on benefits to employmetn statistics
andrewbaxter439
committed
1d698ca
set statistics to produce multiple files
andrewbaxter439
committed
626edc4
added (not working) household stats file
andrewbaxter439
committed
ec3a964
add scenarios to yaml files
andrewbaxter439
committed
84c18c6
new StatisticsHelper abstract class
andrewbaxter439
committed
802c01e
add statistics helper and GHQ caseness to health stats
andrewbaxter439
committed
8accc97
update yamls to point to euromod output excel file
andrewbaxter439
committed
709cd54
added more fine-grain statistics
andrewbaxter439
committed
ab82c9e
refactor params to take reg file names in methods
andrewbaxter439
committed
67baff4
add household structure to health stats
andrewbaxter439
committed
05a0bbe
updated config files for static runs
andrewbaxter439
committed
55350a8
added EUROMOD output fodler loc
andrewbaxter439
committed
b27236f
safe fetch LB receipt (sometimes null)
andrewbaxter439
committed
99ed0f1
tidying and fixing
andrewbaxter439
committed
1eff43d
update validation statistics
andrewbaxter439
committed
097dc6b

Commits on Jan 9, 2026

ignore databasecountryyear
andrewbaxter439
committed
ad3ceab
removed duplicate dot01 constructor
andrewbaxter439
committed
7be562c
update initial pop
andrewbaxter439
committed
d3a62c1
add LB to initial population
andrewbaxter439
committed
2c386af
add Ethn_ enums
andrewbaxter439
committed
3854188

Commits on Jan 16, 2026

switch GHQ caseness estimates to two steps
andrewbaxter439
committed
5392dd3
add documentation to health update methods
andrewbaxter439
committed
f7f7c07
update regression files for health and wellbeing #311
andrewbaxter439
committed
25e2142
re-introducing missing variables for calculating regressions
andrewbaxter439
committed
b8052cf
change life satisfaction to 0-10 scale in initial populations
andrewbaxter439
committed
c715081
updated documentation for additional health helpers #152
andrewbaxter439
committed
9bdef6a
switched dls variable to double
andrewbaxter439
committed
1c02aee
change HM1_C to ordered regression
andrewbaxter439
committed
250d659
initial population change ghq to 0-12
andrewbaxter439
committed
765ce3f
added constrain estimates when not updating stage 2
andrewbaxter439
committed
694d3d1
change ampersand to html code for docs
andrewbaxter439
committed
8b4ad34
corrected file indentations
andrewbaxter439
committed
00586a5
bootstrap health coefficients
andrewbaxter439
committed
57f1e6b
add validation bits
andrewbaxter439
committed
9e9d701

Commits on Jan 19, 2026

Commits on Jan 20, 2026

Commits on Jan 21, 2026

fix bu.findPossibleLabourCombinationsWithUniversalCredit documentation
andrewbaxter439
committed
2366df3

Commits on Jan 23, 2026

updated reg healths with UC variables
andrewbaxter439
committed
2c181ba
pass bootstrapAll parameter to reg file loading
andrewbaxter439
committed
a136084

Commits on Jan 27, 2026

handle missing database excel file
andrewbaxter439
committed
9715350

Commits on Jan 28, 2026

experimental safe bootstrap helper
andrewbaxter439
committed
9220327

Commits on Mar 2, 2026

bootstrap health params on
andrewbaxter439
committed
659720e

Commits on Mar 3, 2026

safely persist country year
andrewbaxter439
committed
1b178d9
update jas mine version
andrewbaxter439
committed
0776d6f

Commits on May 1, 2026

switch for uc labour supply effects
andrewbaxter439
committed
83c7655

Commits on Aug 31, 2026

Merge branch 'develop' into feature/uc-effects-mental-health
amorison
committed
cfb80f3

Commits on Sep 1, 2026

delete redundant ValidatorTest
andrewbaxter439
committed
4d188e2
revised tests and setting of nonUC variables
andrewbaxter439
committed
8504f14
amended ethnicity processing
andrewbaxter439
committed
28e974f
updated test run process to avoid persisting country and year
andrewbaxter439
committed
44f9593
replaced outdated xlsx files
andrewbaxter439
committed
1049ecd
All unit tests passing with new reg files
andrewbaxter439
committed
5ff5e52
revert unneeded changes
andrewbaxter439
committed
4107081
fixed missing wage setter in Person clone
andrewbaxter439
committed
44376d8
revert to non-UC method of determining labour supply
andrewbaxter439
committed
8d54fb9
restore input files to `develop` version
amorison
committed
7f76ac4
delete `.idea/`
amorison
committed
317a4e5
restore `src/test` and `pom.xml` to develop version
amorison
committed
c9cebbd
All unit tests passing with new reg files

andrewbaxter439
authored and
amorison
committed
e6cc67d
rm references to `UC_TAKEUP` db column
amorison
committed
049090b
`createTaxDonorTables`: fix TEMP table manipulation
amorison
committed
a44f453