Skip to content

Fix a bug with the yHhQuintilesMonthC5 variable (BenefitUnit.csv) in the first year of the simulation #500

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
dav-sonn merged 2 commits into from
Aug 4, 2026
Merged

Fix a bug with the yHhQuintilesMonthC5 variable (BenefitUnit.csv) in the first year of the simulation #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bca22c
Fix a bug with the yHhQuintilesMonthC5 variable (BenefitUnit.csv) in …
dav-sonn Aug 4, 2026
dcbf4c0
Update integration test expected CSV outputs
dav-sonn Aug 4, 2026
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
5 changes: 5 additions & 0 deletions src/main/java/simpaths/experiment/SimPathsCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,11 @@ public void update() {
stats.setYHhQuintilesC5P60(p60HouseholdsGrossIncome);
stats.setYHhQuintilesC5P80(p80HouseholdsGrossIncome);

if (model.getYear() > model.getStartYear()) {
for (BenefitUnit benefitUnit : model.getBenefitUnits()) {
benefitUnit.updateIncomeQuintile();
}
}

}

Expand Down
60 changes: 19 additions & 41 deletions src/main/java/simpaths/model/BenefitUnit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1881,20 +1881,7 @@ protected void calculateBUIncome() {
double tmpHHYpnbihs_dv = (ypnbihsMaleMonthly + ypnbihsFemaleMonthly) / equivalisedWeight; //Equivalised
setI_yNonBenHhGrossAsinh(asinh(tmpHHYpnbihs_dv)); //Asinh transformation of HH non-benefit income

//Based on the percentiles calculated by the collector, assign household to one of the quintiles of (equivalised) income distribution
if(collector.getStats() != null) { //Collector only gets initialised when simulation starts running
if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P20()) {
yHhQuintilesMonthC5 = Ydses_c5.Q1;
} else if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P40()) {
yHhQuintilesMonthC5 = Ydses_c5.Q2;
} else if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P60()) {
yHhQuintilesMonthC5 = Ydses_c5.Q3;
} else if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P80()) {
yHhQuintilesMonthC5 = Ydses_c5.Q4;
} else {
yHhQuintilesMonthC5 = Ydses_c5.Q5;
}
}
updateIncomeQuintile();
} else if(getOccupancy().equals(Occupancy.Single_Male)) {

if (male != null) {
Expand All @@ -1909,19 +1896,7 @@ protected void calculateBUIncome() {
double tmpHHYpnbihs_dv = ypnbihsMaleMonthly / equivalisedWeight; //Equivalised
setI_yNonBenHhGrossAsinh(asinh(tmpHHYpnbihs_dv)); //Asinh transformation of HH non-benefit income

if(collector.getStats() != null) { //Collector only gets initialised when simulation starts running
if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P20()) {
yHhQuintilesMonthC5 = Ydses_c5.Q1;
} else if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P40()) {
yHhQuintilesMonthC5 = Ydses_c5.Q2;
} else if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P60()) {
yHhQuintilesMonthC5 = Ydses_c5.Q3;
} else if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P80()) {
yHhQuintilesMonthC5 = Ydses_c5.Q4;
} else {
yHhQuintilesMonthC5 = Ydses_c5.Q5;
}
}
updateIncomeQuintile();
} else
throw new RuntimeException("single male unit does not include a single male");
} else {
Expand All @@ -1939,25 +1914,28 @@ protected void calculateBUIncome() {
double tmpHHYpnbihs_dv = ypnbihsFemaleMonthly / equivalisedWeight; //Equivalised
setI_yNonBenHhGrossAsinh(asinh(tmpHHYpnbihs_dv)); //Asinh transformation of HH non-benefit income

if(collector.getStats() != null) { //Collector only gets initialised when simulation starts running

if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P20()) {
yHhQuintilesMonthC5 = Ydses_c5.Q1;
} else if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P40()) {
yHhQuintilesMonthC5 = Ydses_c5.Q2;
} else if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P60()) {
yHhQuintilesMonthC5 = Ydses_c5.Q3;
} else if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P80()) {
yHhQuintilesMonthC5 = Ydses_c5.Q4;
} else {
yHhQuintilesMonthC5 = Ydses_c5.Q5;
}
}
updateIncomeQuintile();
} else
throw new RuntimeException("single female unit does not include a single male");
}
}

public void updateIncomeQuintile() {
if (collector.getStats() != null) {
if (getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P20()) {
yHhQuintilesMonthC5 = Ydses_c5.Q1;
} else if (getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P40()) {
yHhQuintilesMonthC5 = Ydses_c5.Q2;
} else if (getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P60()) {
yHhQuintilesMonthC5 = Ydses_c5.Q3;
} else if (getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P80()) {
yHhQuintilesMonthC5 = Ydses_c5.Q4;
} else {
yHhQuintilesMonthC5 = Ydses_c5.Q5;
}
}
}

public int getSize() {
return members.size();
}
Expand Down
12 changes: 6 additions & 6 deletions src/test/java/simpaths/integrationtest/expected/AlignmentAdjustmentFactors1.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
run,time,id_AlignmentAdjustmentFactors1,empShareSimACFemales,empShareSimACMales,empShareSimCouples,empShareSimSingleDepFemales,empShareSimSingleDepMales,empShareSimSingleFemales,empShareSimSingleMales,empShareTgtACFemales,empShareTgtACMales,empShareTgtCouples,empShareTgtSingleDepFemales,empShareTgtSingleDepMales,empShareTgtSingleFemales,empShareTgtSingleMales,fertilityAdjFactor,fertilityRateSim,fertilityRateTgt,inSchoolAdjFactor,inSchoolShareSim,inSchoolShareTgt,partnershipAdjFactor,shareCohabitingSim,shareCohabitingTgt,utilityAdjACFemales,utilityAdjACMales,utilityAdjCouples,utilityAdjSingleDepFemales,utilityAdjSingleDepMales,utilityAdjSingleFemales,utilityAdjSingleMales
1,2019.0,1,0.5623931623931624,0.5619047619047619,0.8590878148400273,0.3333333333333333,0.44308943089430897,0.43822697265011,0.5445244410761653,0.5403293808853606,0.5311791259117856,0.8735970003111929,0.3943366638089926,0.465356415881109,0.4438849669010334,0.4705375056413739,0.0,0.05029585798816568,0.05113363440615968,0.0,0.281711358843025,0.3023858368396759,0.0,0.5387792565396972,0.632472038269043,0.0,0.0,0.0,0.0,0.0,0.0,0.0
1,2020.0,1,0.4490644490644491,0.5430711610486891,0.9006183745583038,0.4628975265017668,0.4928571428571429,0.3298311444652908,0.42654700047236654,0.5501985392408713,0.5109522836960044,0.8754389771797882,0.3941959194429085,0.4620365639995361,0.4428142056392469,0.4648045911203806,0.0,0.04911932522947159,0.04996578478889472,0.0,0.2927051671732523,0.2760101854801178,1.5821116748810904,0.6229102972744422,0.6234807968139648,0.0,0.0,0.0,0.0,0.0,0.0,0.0
1,2021.0,1,0.4869215291750503,0.5420393559928444,0.9226486961617345,0.48757763975155277,0.5,0.39576923076923076,0.46745562130177515,0.5382718801505548,0.5130523068280014,0.8776418122289941,0.3980978816455363,0.4641592336214714,0.4451259300414946,0.4776386065456221,0.0,0.05611866501854141,0.04833442666835588,0.0,0.3145210494203783,0.2792655229568481,0.6147268869900452,0.632198783486476,0.6310330629348755,0.0,0.0,0.0,0.0,0.0,0.0,0.0
1,2022.0,1,0.48047538200339557,0.5847328244274809,0.9290843806104129,0.49682539682539684,0.4911111111111111,0.4236343366778149,0.4947916666666667,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.4530541291186285,0.5097880138188646,0.0,0.04872619342072718,0.04938041570024613,0.0,0.3029197080291971,0.2648949027061462,0.0,0.6109502670012225,0.6104874014854431,0.0,0.0,0.0,0.0,0.0,0.0,0.0
1,2020.0,1,0.43844492440604754,0.5152129817444219,0.8983026046239392,0.4653284671532847,0.494949494949495,0.3187919463087248,0.4172461752433936,0.5501985392408713,0.5109522836960044,0.8754389771797882,0.3941959194429085,0.4620365639995361,0.4428142056392469,0.4648045911203806,0.0,0.050434782608695654,0.04996578478889472,0.0,0.3000608642726719,0.2760101854801178,1.5626426082300122,0.6226476525363026,0.6234807968139648,0.0,0.0,0.0,0.0,0.0,0.0,0.0
1,2021.0,1,0.4613821138211382,0.5103578154425612,0.9184925503943909,0.4891304347826087,0.5,0.3802163833075734,0.4492964580300825,0.5382718801505548,0.5130523068280014,0.8776418122289941,0.3980978816455363,0.4641592336214714,0.4451259300414946,0.4776386065456221,0.0,0.05242236024844721,0.04833442666835588,0.0,0.3339455157636976,0.2792655229568481,0.7185893929818753,0.632404406999352,0.6310330629348755,0.0,0.0,0.0,0.0,0.0,0.0,0.0
1,2022.0,1,0.4754653130287648,0.5619047619047619,0.9280842230130486,0.4968152866242038,0.49159663865546216,0.41312453392990306,0.4763244256915143,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.4530541291186285,0.5097880138188646,0.0,0.04865398863917016,0.04938041570024613,0.0,0.3119127008184298,0.2648949027061462,0.0,0.6123811970202928,0.6104874014854431,0.0,0.0,0.0,0.0,0.0,0.0,0.0
2,2019.0,1,0.5623931623931624,0.5625990491283677,0.8589656345695815,0.3341584158415842,0.4426229508196721,0.44052863436123346,0.5452823039029936,0.5403293808853606,0.5311791259117856,0.8735970003111929,0.3943366638089926,0.465356415881109,0.4438849669010334,0.4705375056413739,0.0,0.05025868440502587,0.05113363440615968,0.0,0.28154170430593195,0.3023858368396759,0.0,0.5392124746118063,0.632472038269043,0.0,0.0,0.0,0.0,0.0,0.0,0.0
2,2020.0,1,0.4968421052631579,0.516728624535316,0.8991959499702203,0.46539792387543255,0.49336283185840707,0.32237579379902875,0.42258823529411765,0.5501985392408713,0.5109522836960044,0.8754389771797882,0.3941959194429085,0.4620365639995361,0.4428142056392469,0.4648045911203806,0.0,0.05358471843215083,0.04996578478889472,0.0,0.29526123936816523,0.2760101854801178,1.612974117630252,0.6220344491387715,0.6234807968139648,0.0,0.0,0.0,0.0,0.0,0.0,0.0
2,2021.0,1,0.522633744855967,0.5338208409506399,0.9170299331589654,0.4921875,0.4981060606060606,0.3822746291365538,0.4681575109382596,0.5382718801505548,0.5130523068280014,0.8776418122289941,0.3980978816455363,0.4641592336214714,0.4451259300414946,0.4776386065456221,0.0,0.06938675787930614,0.04833442666835588,0.0,0.30186972255729794,0.2792655229568481,0.6958228869629879,0.6325258626228876,0.6310330629348755,0.0,0.0,0.0,0.0,0.0,0.0,0.0
2,2022.0,1,0.4956369982547993,0.5676923076923077,0.928942542787286,0.4937888198757764,0.4944029850746269,0.4195906432748538,0.4913752913752914,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.4530541291186285,0.5097880138188646,0.0,0.048714144411473786,0.04938041570024613,0.0,0.3117001828153565,0.2648949027061462,0.0,0.6076616531687877,0.6104874014854431,0.0,0.0,0.0,0.0,0.0,0.0,0.0
2,2020.0,1,0.488272921108742,0.49510763209393344,0.8968371268105232,0.4642857142857143,0.48863636363636365,0.31084606783451363,0.4122315592903828,0.5501985392408713,0.5109522836960044,0.8754389771797882,0.3941959194429085,0.4620365639995361,0.4428142056392469,0.4648045911203806,0.0,0.05477075588599752,0.04996578478889472,0.0,0.29936305732484075,0.2760101854801178,1.597215988964044,0.6226844328891777,0.6234807968139648,0.0,0.0,0.0,0.0,0.0,0.0,0.0
2,2021.0,1,0.5112936344969199,0.515828677839851,0.9155542658154382,0.48833333333333334,0.5,0.37012987012987014,0.4497328800388538,0.5382718801505548,0.5130523068280014,0.8776418122289941,0.3980978816455363,0.4641592336214714,0.4451259300414946,0.4776386065456221,0.0,0.05953557312252965,0.04833442666835588,0.0,0.3200365408038977,0.2792655229568481,0.7195704173500472,0.6317897048375638,0.6310330629348755,0.0,0.0,0.0,0.0,0.0,0.0,0.0
2,2022.0,1,0.4878472222222222,0.5517241379310345,0.9268476621417798,0.49508196721311476,0.49607843137254903,0.4112252384446075,0.48206071757129715,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.4530541291186285,0.5097880138188646,0.0,0.048617966436327736,0.04938041570024613,0.0,0.3205712549377089,0.2648949027061462,0.0,0.6078255291853752,0.6104874014854431,0.0,0.0,0.0,0.0,0.0,0.0,0.0
12 changes: 6 additions & 6 deletions src/test/java/simpaths/integrationtest/expected/EmploymentStatistics1.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
run,time,id_EmploymentStatistics1,labEmpShare,labEmpToNotEmpShare,labNotEmpToEmpShare,labUnempShare
1,2019.0,1,0.712445288628293,0.0,0.0,0.15533900404657694
1,2020.0,1,0.7179465983301645,0.07705459933888066,0.40707497360084477,0.1521864925188063
1,2021.0,1,0.7550785426433095,0.017280071813285457,0.3768038482095136,0.10518957151081504
1,2022.0,1,0.7656365275842282,0.02423469387755102,0.29309035687167806,0.0988605623411755
1,2020.0,1,0.7127131269657342,0.08610857664233576,0.39660657476139977,0.15800364178116205
1,2021.0,1,0.7461665292662819,0.020821545773452528,0.36030927835051546,0.11286067600989283
1,2022.0,1,0.7609229258713794,0.023967472715600256,0.28347578347578345,0.10423825887743414
2,2019.0,1,0.7128238983330583,0.0,0.0,0.15514111239478462
2,2020.0,1,0.7114559260482007,0.08077709611451943,0.38862307283359915,0.15673489600528226
2,2021.0,1,0.7493476842791911,0.01766824217870808,0.3622967479674797,0.11358447488584475
2,2022.0,1,0.757982642868839,0.025698682942499197,0.2967651195499297,0.10283281480268544
2,2020.0,1,0.7056395012798282,0.08969986357435197,0.37845010615711255,0.16373544711419372
2,2021.0,1,0.7423297785069729,0.021044249800932772,0.3522446965959546,0.12026251025430681
2,2022.0,1,0.7542068289495181,0.024916765116528836,0.2840079628400796,0.10790720470511354
Loading
Loading