Skip to content

Feature/uc effects mental health #161

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.

Sign up for GitHub

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

Closed
andrewbaxter439 wants to merge 61 commits into from
Closed

Feature/uc effects mental health #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
15eb5f7
added benefits uc/nonuc lagged/nonlagged getters/setters
andrewbaxter439 Mar 6, 2025
eb750db
added enums calling getters for uc/nonuc
andrewbaxter439 Mar 6, 2025
a78188b
safe check if benefit lags are null
andrewbaxter439 Mar 6, 2025
f70539b
set benefit receipt lags at baseline value in intialisation
andrewbaxter439 Mar 6, 2025
d18b4bf
setting UC/nonUC flags at initial population matching
andrewbaxter439 Mar 6, 2025
60b4906
update lagged variables
andrewbaxter439 Mar 6, 2025
1a1e980
added uc receipt to babies
andrewbaxter439 Mar 6, 2025
8202b5c
added `bsauc_s` to EUROMOD input
andrewbaxter439 Mar 6, 2025
27feb6e
temp UC setting method - all receive UC
andrewbaxter439 Mar 6, 2025
9cd9f74
fixed variable names
andrewbaxter439 Mar 12, 2025
57fd2c5
extra line to gitignore
andrewbaxter439 Mar 12, 2025
d1ad5fe
Merge branch 'develop' into feature/uc-effects-mental-health
andrewbaxter439 Mar 25, 2025
4f137a2
extract MCS2 load parameters to distinct function
andrewbaxter439 Mar 25, 2025
abb97bb
added a test class of person with an ID
andrewbaxter439 Mar 25, 2025
c082b77
added a test class of Benefit Unit with id
andrewbaxter439 Mar 25, 2025
c799984
added settters for some benefit unit attrs
andrewbaxter439 Mar 25, 2025
5796e78
added MCS2 tests to PersonTest
andrewbaxter439 Mar 25, 2025
d682a66
Added person enums for UC receipt by hours
andrewbaxter439 Mar 25, 2025
9fdcd37
updated MCS2 sheets with additional UC elements
andrewbaxter439 Mar 25, 2025
0253cd8
column names for MCS to include UC params
andrewbaxter439 Mar 25, 2025
0e9f633
update person MCS tests to include UC effects
andrewbaxter439 Mar 25, 2025
6424540
add markers of benefit receipt to read from initial files
andrewbaxter439 Mar 25, 2025
fe10e5d
tidied person tests
andrewbaxter439 Mar 26, 2025
5421811
Updated Person test class with seed passed to Innovation object
andrewbaxter439 Mar 28, 2025
1511cd5
updated PersonTest with new test person object
andrewbaxter439 Mar 28, 2025
60a2514
Three successful non-UC MCS tests
andrewbaxter439 Mar 26, 2025
6a4e59a
added passing tests for UC MCS effects
andrewbaxter439 Mar 26, 2025
76f8d14
add a UC rollout flag and temporary logic
andrewbaxter439 Mar 26, 2025
ef8f743
Update src/main/java/simpaths/model/BenefitUnit.java
andrewbaxter439 Mar 28, 2025
2505c26
added dummy columns for UC effects for all outcomes
andrewbaxter439 Apr 4, 2025
f594d34
UC flat effects applied with working tests - MCS
andrewbaxter439 Apr 14, 2025
a941622
added legacy benefit parameters to setup readin
andrewbaxter439 Apr 14, 2025
abfc816
updating legacy benefit and UC receipt from donor population
andrewbaxter439 Apr 14, 2025
932a30b
new health statistics file
andrewbaxter439 Apr 14, 2025
19da4d8
receives benefit flags default to zero
andrewbaxter439 Apr 14, 2025
ead5d7d
add health stats calls to collector
andrewbaxter439 Apr 14, 2025
b209685
update benefit receipt across benefit units
andrewbaxter439 Apr 14, 2025
c043ec1
fuller health stats calculations
andrewbaxter439 Apr 14, 2025
86db1a4
alternative UC receipt detection
andrewbaxter439 Apr 14, 2025
66d0d16
Merge branch 'experimental/parameter_parsing' into feature/uc-effects…
andrewbaxter439 Apr 14, 2025
9bbd2c6
make uc_rollout not final so able to change
andrewbaxter439 Apr 14, 2025
4ea3d0b
config file for no UC rollout
andrewbaxter439 Apr 14, 2025
9a9a346
update start year to 2019 in github actions
andrewbaxter439 Apr 14, 2025
2f2051f
change github actions to not use irrelevant policy files
andrewbaxter439 Apr 15, 2025
4865c2c
add qaly and wellby calcs
andrewbaxter439 Apr 15, 2025
7410fcb
parse config files at start of run to set most parameters
andrewbaxter439 Apr 15, 2025
94c3c37
config files for UC on and off runs
andrewbaxter439 Apr 15, 2025
30027af
change spelling mistake
andrewbaxter439 Apr 15, 2025
cd26d33
attempt correct yml files
andrewbaxter439 Apr 15, 2025
bba8f13
flagging temp code in DonorTaxImputation
andrewbaxter439 Apr 15, 2025
bcf65bf
switch eq5d process to end of year
andrewbaxter439 Apr 16, 2025
176ee37
Merge branch 'develop' into feature/uc-effects-mental-health
andrewbaxter439 Jun 3, 2025
1c73cfd
removed repeated code
andrewbaxter439 Jun 3, 2025
5f6efbe
Update src/main/java/simpaths/experiment/SimPathsCollector.java
andrewbaxter439 Jun 3, 2025
4148ff5
Update src/main/java/simpaths/model/Person.java
andrewbaxter439 Jun 3, 2025
586a850
remove excess config files
andrewbaxter439 Jun 3, 2025
5820d21
default UC off
andrewbaxter439 Jun 3, 2025
23d8d3d
Merge remote-tracking branch 'sphsu-origin/feature/uc-effects-mental-…
andrewbaxter439 Jun 3, 2025
f76be91
add `bsauc_s` dummy to training data 2011-2013
andrewbaxter439 Jun 3, 2025
b92d774
new validation health statistics
andrewbaxter439 Jun 3, 2025
909f371
remove repeated health statistics collection calls
andrewbaxter439 Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,3 +338,4 @@ input/EUROMODoutput/current/uk_2026_std.txt
input/EUROMODoutput/current/uk_2027_std.txt
input/InitialPopulations/current/*
input/InitialPopulations/testing/*
.Rproj.user
Loading