Skip to content

Adding UC effects on mental health - clean branch #202

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

Merged
justin-ven merged 29 commits into from
Jun 17, 2025
Merged

Adding UC effects on mental health - clean branch #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
62a8f6a
added benefits uc/nonuc lagged/nonlagged getters/setters
andrewbaxter439 Mar 6, 2025
e314689
added enums calling getters for uc/nonuc
andrewbaxter439 Mar 6, 2025
5ad2f3d
safe check if benefit lags are null
andrewbaxter439 Mar 6, 2025
e293047
set benefit receipt lags at baseline value in intialisation
andrewbaxter439 Mar 6, 2025
3fbc46e
setting UC/nonUC flags at initial population matching
andrewbaxter439 Mar 6, 2025
656467f
update lagged variables
andrewbaxter439 Mar 6, 2025
6e01cf5
added uc receipt to babies
andrewbaxter439 Mar 6, 2025
8cebeca
added `bsauc_s` to EUROMOD input
andrewbaxter439 Mar 6, 2025
15686a0
fixed variable names
andrewbaxter439 Mar 12, 2025
dff00a3
Added person enums for UC receipt by hours
andrewbaxter439 Mar 25, 2025
4060ee1
updated MCS2 sheets with additional UC elements
andrewbaxter439 Mar 25, 2025
af36b41
column names for MCS to include UC params
andrewbaxter439 Mar 25, 2025
ccc233c
add markers of benefit receipt to read from initial files
andrewbaxter439 Mar 25, 2025
f3c65ac
add a UC rollout flag and temporary logic
andrewbaxter439 Mar 26, 2025
e9534a6
Update src/main/java/simpaths/model/BenefitUnit.java
andrewbaxter439 Mar 28, 2025
708caaf
added dummy columns for UC effects for all outcomes
andrewbaxter439 Apr 4, 2025
6d3fa1b
UC flat effects applied
andrewbaxter439 Jun 12, 2025
13c293b
added legacy benefit parameters to setup readin
andrewbaxter439 Apr 14, 2025
de50c73
updating legacy benefit and UC receipt from donor population
andrewbaxter439 Apr 14, 2025
3a8b9c7
receives benefit flags default to zero
andrewbaxter439 Apr 14, 2025
c007083
update benefit receipt across benefit units
andrewbaxter439 Apr 14, 2025
11f23a1
alternative UC receipt detection
andrewbaxter439 Apr 14, 2025
3feaa69
make uc_rollout not final so able to change
andrewbaxter439 Apr 14, 2025
08eb0f2
Update src/main/java/simpaths/model/Person.java
andrewbaxter439 Jun 3, 2025
da64a12
add `bsauc_s` dummy to training data 2011-2013
andrewbaxter439 Jun 3, 2025
4f0e2b7
new validation health statistics
andrewbaxter439 Jun 3, 2025
71d962f
parse config files at start of run to set most parameters
andrewbaxter439 Apr 15, 2025
28cb1bf
updated health statistics
andrewbaxter439 Jun 13, 2025
f296a9d
Tidy DB Setup runs
andrewbaxter439 Jun 13, 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
85,366 changes: 42,683 additions & 42,683 deletions input/EUROMODoutput/training/uk_2011_std.txt
View file
Open in desktop
85,366 changes: 42,683 additions & 42,683 deletions input/EUROMODoutput/training/uk_2012_std.txt
View file
Open in desktop
85,366 changes: 42,683 additions & 42,683 deletions input/EUROMODoutput/training/uk_2013_std.txt
View file
Open in desktop
Binary file modified input/reg_health_mental.xlsx
View file
Open in desktop
Binary file not shown.
Binary file modified input/reg_health_wellbeing.xlsx
View file
Open in desktop
Binary file not shown.
30 changes: 21 additions & 9 deletions src/main/java/simpaths/data/Parameters.java
View file
Open in desktop
28 changes: 20 additions & 8 deletions src/main/java/simpaths/experiment/SimPathsMultiRun.java
View file
Open in desktop
53 changes: 53 additions & 0 deletions src/main/java/simpaths/model/BenefitUnit.java
View file
Open in desktop
75 changes: 75 additions & 0 deletions src/main/java/simpaths/model/Person.java
View file
Open in desktop
7 changes: 7 additions & 0 deletions src/main/java/simpaths/model/TaxEvaluation.java
View file
Open in desktop
29 changes: 28 additions & 1 deletion src/main/java/simpaths/model/taxes/DonorPersonPolicy.java
View file
Open in desktop
30 changes: 30 additions & 0 deletions src/main/java/simpaths/model/taxes/DonorTaxImputation.java
View file
Open in desktop
21 changes: 21 additions & 0 deletions src/main/java/simpaths/model/taxes/DonorTaxUnitPolicy.java
View file
Open in desktop
6 changes: 6 additions & 0 deletions src/main/java/simpaths/model/taxes/database/TaxDonorDataParser.java
View file
Open in desktop
36 changes: 18 additions & 18 deletions src/test/java/simpaths/integrationtest/expected/HealthStatistics1.csv
View file
Open in desktop