Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
12bf190
change employment draws to lifetime
andrewbaxter439 May 14, 2025
afc9748
Adding labour supply persistence probability
andrewbaxter439 Jun 3, 2025
0b65c21
Allow labour supply persistence from prev year at set probability
andrewbaxter439 Jun 3, 2025
0686448
revert to old labour supply model (pre Jun 2024)
andrewbaxter439 Jun 5, 2025
809b931
Revert "revert to old labour supply model (pre Jun 2024)"
andrewbaxter439 Jun 17, 2025
78b95a7
Add differential probability by employment
andrewbaxter439 Jun 17, 2025
662ce7e
fixed innovations assignment logic
andrewbaxter439 Jun 20, 2025
59567a3
oct 24 labour supply added
andrewbaxter439 Jun 20, 2025
761d4c1
now working labour supply coefs
andrewbaxter439 Jul 25, 2025
c7a5124
update parameters for persistence
andrewbaxter439 Jul 28, 2025
7301fbb
Merge branch 'develop' into experimental/lifetime_draws
andrewbaxter439 Jul 28, 2025
f914942
tidied code
andrewbaxter439 Jul 28, 2025
327e9ae
updated stats
andrewbaxter439 Jul 28, 2025
b4cfa40
updated statistics files
andrewbaxter439 Jul 29, 2025
6107434
update terms
andrewbaxter439 Aug 6, 2025
ddd2d82
updated statistics
andrewbaxter439 Aug 6, 2025
e5f733f
added labour by UC enums and case statements
andrewbaxter439 Aug 14, 2025
7d63cfd
add getter for liwwh
andrewbaxter439 Aug 15, 2025
59273c2
added case statements for Liwwh
andrewbaxter439 Aug 15, 2025
663c344
updated labour supply utility coefficients
andrewbaxter439 Aug 15, 2025
2f3c674
new method for UC linked benefit combinations
andrewbaxter439 Aug 15, 2025
20c54a3
uc_takeup getters and setters
andrewbaxter439 Aug 15, 2025
6c076c5
new probs calculation methods for Triple with UC param
andrewbaxter439 Aug 15, 2025
bdac0e2
new method for labour supply with UC on/off
andrewbaxter439 Aug 15, 2025
d9dfa35
update labour supply utility to correct vals
andrewbaxter439 Aug 15, 2025
08bf2bf
implement UC update method
andrewbaxter439 Aug 15, 2025
ced3e9a
add missing regressor MaleLeisure_UKI
andrewbaxter439 Aug 15, 2025
d19da07
add uc takeup to employment statistics
andrewbaxter439 Aug 15, 2025
f709049
add uc stats to employment statistics
andrewbaxter439 Aug 15, 2025
89d2a0d
uc updates on for individuals
andrewbaxter439 Aug 15, 2025
5dedff7
tweak persist probs
andrewbaxter439 Aug 18, 2025
92abdd6
attempt labour supply match for UC
andrewbaxter439 Aug 18, 2025
03ff37f
update validation statistics
andrewbaxter439 Aug 20, 2025
e6bfb38
add benefit graphs
andrewbaxter439 Aug 20, 2025
08ceec1
added skeleton validator tests
andrewbaxter439 Aug 20, 2025
f8d5df5
updated validator and test
andrewbaxter439 Aug 20, 2025
663d14e
fixed tests
andrewbaxter439 Aug 20, 2025
87409ce
refactored loading parameters and validation statistics
andrewbaxter439 Aug 20, 2025
28a2d22
add legacy benefit indicator to initial population
andrewbaxter439 Aug 21, 2025
fa182ed
LB flags for legacy benefit receipt
andrewbaxter439 Aug 21, 2025
6d9ea89
reset filtered pool on iterations
andrewbaxter439 Sep 1, 2025
b20f415
intermediate
justin-ven Sep 2, 2025
ac0b665
update tax function for UC
justin-ven Sep 3, 2025
055f63a
Merge pull request #236 from centreformicrosimulation/feature/193-upd…
andrewbaxter439 Sep 4, 2025
26814f1
added uc config file
andrewbaxter439 Sep 4, 2025
fb2a383
ignore fulelr files
andrewbaxter439 Sep 4, 2025
17e0d54
add option to write log files but keep console output
andrewbaxter439 Sep 3, 2025
dce9ba7
add legacy benefit receipt enum
andrewbaxter439 Sep 3, 2025
03e1bbd
switch labour supply uc calculations to end
andrewbaxter439 Sep 5, 2025
7ddba6f
setting UC and LB receipt more consistently
andrewbaxter439 Sep 5, 2025
948ffec
remove UC pool filtering
andrewbaxter439 Sep 5, 2025
e007741
amend config file dates
andrewbaxter439 Sep 5, 2025
d4f694c
non-null calling of receives LB
andrewbaxter439 Sep 5, 2025
a8a7c4b
calculating LB and UC amounts
andrewbaxter439 Sep 5, 2025
160e4af
testing that UC receipt is propagated from BU to Person
andrewbaxter439 Sep 5, 2025
8db8b67
updated labour supply utility estimates
andrewbaxter439 Sep 5, 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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ input/input.h2.db
input/input.h2.db
input/input.trace.db
/input/input.mv.db
/input_full/
.idea/compiler.xml
.idea/dataSources.local.xml
.idea/encodings.xml
Expand Down Expand Up @@ -338,3 +339,4 @@ input/EUROMODoutput/current/uk_2026_std.txt
input/EUROMODoutput/current/uk_2027_std.txt
input/InitialPopulations/current/*
input/InitialPopulations/testing/*
input/EUROMODoutput/working/*
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

67 changes: 67 additions & 0 deletions config/uc_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# This file can be used to override defaults for multirun arguments.
# Arguments of the SimPathsMultiRun object overridden by the command-line

maxNumberOfRuns: 1
executeWithGui: false
randomSeed: 600
startYear: 2015
endYear: 2020
popSize: 80000

# Arguments passed to the SimPathsModel
model_args:
# maxAge: 130
# fixTimeTrend: true
# timeTrendStopsIn: 2017
# fixRandomSeed: true
# sIndexTimeWindow: 5
# sIndexAlpha: 2
# sIndexDelta: 0
# savingRate: 0
# initialisePotentialEarningsFromDatabase: true
# useWeights: false
# useSBAMMatching:
# projectMortality: true
# alignFertility: true
# labourMarketCovid19On: false
# projectFormalChildcare: true
# donorPoolAveraging: true
# alignEmployment: false
# projectSocialCare: false
# enableIntertemporalOptimisations: true
# responsesToLowWageOffer: true
# saveImperfectTaxDBMatches: false
# useSavedBehaviour: false
# readGrid: "laptop serial"
# saveBehaviour: true
# employmentOptionsOfPrincipalWorker: 3
# employmentOptionsOfSecondaryWorker: 3
# responsesToEducation: true
# responsesToRetirement: false
# responsesToHealth: true
# responsesToDisability: false
# minAgeForPoorHealth: 50
# responsesToRegion: false

# Arguments that alter processing of the SimPathsMultiRun object
innovation_args:
# randomSeedInnov: false
# intertemporalElasticityInnov: false
# labourSupplyElasticityInnov: true

collector_args:
# calculateGiniCoefficients: false
# exportToDatabase: false
# exportToCSV: true
# persistStatistics: true
# persistStatistics2: true
persistPersons: true
persistBenefitUnits: true
persistHouseholds: true
# dataDumpStartTime: 0L
# dataDumpTimePeriod: 1.0

parameter_args:
input_directory: input_full
# input_directory_initial_populations: input/InitialPopulations
# euromod_output_directory: input/EUROMODoutput
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,12 @@ preserve
* Generate UC benefit marker
gen benefits_uc=(ficode==40)
label var benefits_uc "Universal Credit indicator"
gen benefits_lb=(ficode == 15 | ficode == 16 | ficode == 19 | ficode == 20 | ficode == 22 | ficode == 33)
label var benefits_lb "Legacy Benefits indicator"


keep hidp pidp swv benefits_uc
collapse (max) benefits_uc, by(hidp swv)
keep hidp pidp swv benefits_uc benefits_lb
collapse (max) benefits_uc benefits_lb, by(hidp swv)
compress

save "$dir_data/tmp_ucrcpt", replace
Expand Down
9 changes: 7 additions & 2 deletions input/InitialPopulations/compile/02_create_UKHLS_variables.do
Original file line number Diff line number Diff line change
Expand Up @@ -1408,6 +1408,11 @@ gen econ_benefits_uc=econ_benefits
replace econ_benefits_uc=0 if benefits_uc==0
label var econ_benefits_uc "Household income includes UC benefits"

gen econ_benefits_lb=benefits_lb
replace econ_benefits_lb=0 if benefits_lb==.
replace econ_benefits_lb=0 if econ_benefits_uc==1
label var econ_benefits_lb "Household income includes Legacy Benefits"


/***************************** Financial Distress ***************************************************************************/
// This is a measure of subjective financial distress, corresponding to answering 4 or 5 to the question below:
Expand Down Expand Up @@ -1508,7 +1513,7 @@ keep ivfio idhh idperson idpartner idfather idmother dct drgn1 dwt dnc02 dnc dgn
ded deh_c3 der dehsp_c3 dehm_c3 dehf_c3 dehmf_c3 dcpen dcpyy dcpex dcpagdf dlltsd dlrtrd drtren dlftphm dhhtp_c4 dhm dhm_ghq dimlwt disclwt ///
dimxwt dhhwt jbhrs jshrs j2hrs jbstat les_c3 les_c4 lessp_c3 lessp_c4 lesdf_c4 ydses_c5 month scghq2_dv ///
ypnbihs_dv yptciihs_dv yplgrs_dv ynbcpdf_dv ypncp ypnoab swv sedex ssscp sprfm sedag stm dagsp lhw l1_lhw pno ppno hgbioad1 hgbioad2 der adultchildflag ///
econ_benefits econ_benefits_nonuc econ_benefits_uc ///
econ_benefits econ_benefits_nonuc econ_benefits_uc econ_benefits_lb ///
sedcsmpl sedrsmpl scedsmpl dhh_owned dukfr dchpd dagpns dagpns_sp CPI lesnr_c2 dlltsd_sp ypnoab_lvl *_flag Int_Date dhe_mcs dhe_pcs dls dot unemp financial_distress

sort swv idhh idperson
Expand All @@ -1519,7 +1524,7 @@ foreach var in idhh idperson idpartner idfather idmother dct drgn1 dwt dnc02 dnc
ded deh_c3 der dehsp_c3 dehm_c3 dehf_c3 dehmf_c3 dcpen dcpyy dcpex dlltsd dlrtrd drtren dlftphm dhhtp_c4 dhm dhm_ghq ///
jbhrs jshrs j2hrs jbstat les_c3 les_c4 lessp_c3 lessp_c4 lesdf_c4 ydses_c5 scghq2_dv ///
ypnbihs_dv yptciihs_dv yplgrs_dv swv sedex ssscp sprfm sedag stm dagsp lhw l1_lhw pno ppno hgbioad1 hgbioad2 der dhh_owned ///
econ_benefits econ_benefits_nonuc econ_benefits_uc ///
econ_benefits econ_benefits_nonuc econ_benefits_uc econ_benefits_lb ///
scghq2_dv_miss_flag dchpd dagpns dagpns_sp CPI lesnr_c2 dlltsd_sp ypnoab_lvl *_flag dhe_mcs dhe_pcs dls dot unemp {
qui recode `var' (-9/-1=-9) (.=-9)
}
Expand Down
6 changes: 3 additions & 3 deletions input/InitialPopulations/compile/09_finalise_input_data.do
Original file line number Diff line number Diff line change
Expand Up @@ -184,19 +184,19 @@ forvalues yy = $firstSimYear/$lastSimYear {
yplgrs_dv ypnbihs_dv yptciihs_dv dhhtp_c4 ssscp dcpen dcpyy dcpex dcpagdf ynbcpdf_dv der sedag sprfm dagsp dehsp_c3 dhesp lessp_c3 dehm_c3 dehf_c3 ///
stm lesdf_c4 ppno dhm scghq2_dv dhh_owned lhw l1_lhw drgn1 dct dwt_sampling les_c4 dhm_ghq lessp_c4 adultchildflag multiplier dwt ///
potential_earnings_hourly l1_potential_earnings_hourly liquid_wealth tot_pen nvmhome need_socare formal_socare_hrs partner_socare_hrs daughter_socare_hrs son_socare_hrs other_socare_hrs formal_socare_cost ///
econ_benefits econ_benefits_nonuc econ_benefits_uc ///
econ_benefits econ_benefits_nonuc econ_benefits_uc econ_benefits_lb ///
ypncp ypnoab aidhrs carewho dhe_mcs dhe_pcs dls dot unemp financial_distress

order idhh idbenefitunit idperson idpartner idmother idfather pno swv dgn dag dcpst dnc02 dnc ded deh_c3 sedex jbstat les_c3 dlltsd dhe ydses_c5 yplgrs_dv ypnbihs_dv yptciihs_dv dhhtp_c4 ssscp dcpen ///
dcpyy dcpex dcpagdf ynbcpdf_dv der sedag sprfm dagsp dehsp_c3 dhesp lessp_c3 dehm_c3 dehf_c3 stm lesdf_c4 ppno dhm scghq2_dv dhh_owned lhw l1_lhw drgn1 dct dwt_sampling les_c4 dhm_ghq lessp_c4 adultchildflag ///
multiplier dwt potential_earnings_hourly l1_potential_earnings_hourly liquid_wealth tot_pen nvmhome need_socare formal_socare_hrs partner_socare_hrs daughter_socare_hrs son_socare_hrs other_socare_hrs formal_socare_cost ///
econ_benefits econ_benefits_nonuc econ_benefits_uc ///
econ_benefits econ_benefits_nonuc econ_benefits_uc econ_benefits_lb ///
ypncp ypnoab aidhrs carewho dhe_mcs dhe_pcs dls dot unemp financial_distress

recode idhh idbenefitunit idperson idpartner idmother idfather pno swv dgn dag dcpst dnc02 dnc ded deh_c3 sedex jbstat les_c3 dlltsd dhe ydses_c5 yplgrs_dv ypnbihs_dv yptciihs_dv dhhtp_c4 ssscp ///
dcpen dcpyy dcpex dcpagdf ynbcpdf_dv der sedag sprfm dagsp dehsp_c3 dhesp lessp_c3 dehm_c3 dehf_c3 stm lesdf_c4 ppno dhm scghq2_dv dhh_owned lhw l1_lhw drgn1 dct dwt_sampling les_c4 dhm_ghq lessp_c4 ///
adultchildflag multiplier dwt potential_earnings_hourly l1_potential_earnings_hourly liquid_wealth tot_pen nvmhome need_socare formal_socare_hrs partner_socare_hrs daughter_socare_hrs son_socare_hrs other_socare_hrs ///
econ_benefits econ_benefits_nonuc econ_benefits_uc ///
econ_benefits econ_benefits_nonuc econ_benefits_uc econ_benefits_lb ///
formal_socare_cost ypncp ypnoab aidhrs carewho dhe_mcs dhe_pcs dls dot unemp financial_distress (missing=-9)

gsort idhh idbenefitunit idperson
Expand Down
Loading
Loading