diff --git a/input/DatabaseCountryYear.xlsx b/input/DatabaseCountryYear.xlsx index c962e7860..cddc317cf 100644 Binary files a/input/DatabaseCountryYear.xlsx and b/input/DatabaseCountryYear.xlsx differ diff --git a/input/InitialPopulations/compile/01_prepare_UKHLS_pooled_data.do b/input/InitialPopulations/compile/01_prepare_UKHLS_pooled_data.do index bff821225..6f6e80dea 100644 --- a/input/InitialPopulations/compile/01_prepare_UKHLS_pooled_data.do +++ b/input/InitialPopulations/compile/01_prepare_UKHLS_pooled_data.do @@ -117,16 +117,16 @@ foreach w of global UKHLSwaves { local waveno=strpos("abcdefghijklmnopqrstuvwxyz","`w'") if (`waveno'==1) { - use `w'_hidp `w'_fihhmnnet1_dv `w'_fihhmngrs1_dv `w'_fihhmnsben_dv `w'_nch02_dv /*`w'_hhdenub_xw `w'_hhdenui_xw*/ `w'_hsownd using `w'_hhresp.dta, clear + use `w'_hidp `w'_fihhmnnet1_dv `w'_ieqmoecd_dv `w'_fihhmngrs1_dv `w'_fihhmnsben_dv `w'_nch02_dv /*`w'_hhdenub_xw `w'_hhdenui_xw*/ `w'_hsownd using `w'_hhresp.dta, clear } else if (`waveno'<6) { - use `w'_hidp `w'_fihhmnnet1_dv `w'_fihhmngrs1_dv `w'_fihhmnsben_dv `w'_nch02_dv `w'_hhdenub_xw /*`w'_hhdenui_xw*/ `w'_hsownd using `w'_hhresp.dta, clear + use `w'_hidp `w'_fihhmnnet1_dv `w'_ieqmoecd_dv `w'_fihhmngrs1_dv `w'_fihhmnsben_dv `w'_nch02_dv `w'_hhdenub_xw /*`w'_hhdenui_xw*/ `w'_hsownd using `w'_hhresp.dta, clear } else if (`waveno'<14) { - use `w'_hidp `w'_fihhmnnet1_dv `w'_fihhmngrs1_dv `w'_fihhmnsben_dv `w'_nch02_dv /*`w'_hhdenub_xw*/ `w'_hhdenui_xw `w'_hsownd using `w'_hhresp.dta, clear + use `w'_hidp `w'_fihhmnnet1_dv `w'_ieqmoecd_dv `w'_fihhmngrs1_dv `w'_fihhmnsben_dv `w'_nch02_dv /*`w'_hhdenub_xw*/ `w'_hhdenui_xw `w'_hsownd using `w'_hhresp.dta, clear } else if (`waveno'==14) { - use `w'_hidp `w'_fihhmnnet1_dv `w'_fihhmngrs1_dv `w'_fihhmnsben_dv `w'_nch02_dv /*`w'_hhdenub_xw `w'_hhdenui_xw*/ `w'_hhdeng2_xw `w'_hsownd using `w'_hhresp.dta, clear + use `w'_hidp `w'_fihhmnnet1_dv `w'_ieqmoecd_dv `w'_fihhmngrs1_dv `w'_fihhmnsben_dv `w'_nch02_dv /*`w'_hhdenub_xw `w'_hhdenui_xw*/ `w'_hhdeng2_xw `w'_hsownd using `w'_hhresp.dta, clear } gen swv = `waveno' diff --git a/input/InitialPopulations/compile/02_create_UKHLS_variables.do b/input/InitialPopulations/compile/02_create_UKHLS_variables.do index c56156783..e4e8b856e 100644 --- a/input/InitialPopulations/compile/02_create_UKHLS_variables.do +++ b/input/InitialPopulations/compile/02_create_UKHLS_variables.do @@ -1852,6 +1852,7 @@ keep ivfio idhh idperson idpartner idfather idmother dct drgn1 dwt dnc02 dnc dgn dimxwt dhhwt jbhrs jshrs j2hrs jbstat les_c3 les_c4 lessp_c3 lessp_c4 lesdf_c4 ydses_c5 month scghq2_dv ydisp /// 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 /// + fihhmnnet1_dv ieqmoecd_dv /// sedcsmpl sedrsmpl scedsmpl dhh_owned dukfr dchpd dagpns dagpns_sp CPI lesnr_c2 dlltsd_sp dlltsd01_sp ypnoab_lvl *_flag Int_Date dhe_mcs dhe_pcs dhe_mcssp dhe_pcssp dls dot dot01 unemp financial_distress sort swv idhh idperson @@ -1863,6 +1864,7 @@ foreach var in idhh idperson idpartner idfather idmother dct drgn1 dwt dnc02 dnc 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 /// + fihhmnnet1_dv ieqmoecd_dv /// scghq2_dv_miss_flag dchpd dagpns dagpns_sp CPI lesnr_c2 dlltsd_sp dlltsd01_sp ypnoab_lvl *_flag dhe_mcs dhe_pcs dhe_mcssp dhe_pcssp dls dot dot01 unemp { qui recode `var' (-9/-1=-9) (.=-9) } diff --git a/input/InitialPopulations/compile/RegressionEstimates/master.do b/input/InitialPopulations/compile/RegressionEstimates/master.do index 86930a566..61b2a8cd2 100644 --- a/input/InitialPopulations/compile/RegressionEstimates/master.do +++ b/input/InitialPopulations/compile/RegressionEstimates/master.do @@ -111,6 +111,8 @@ do "${dir_do}/reg_health_mental.do" do "${dir_do}/reg_health_wellbeing.do" +do "${dir_do}/reg_financial_distress.do" + ******************************************************************************* * INTERNAL VALIDATION FILES ****************************************************************************** diff --git a/input/InitialPopulations/compile/RegressionEstimates/reg_financial_distress.do b/input/InitialPopulations/compile/RegressionEstimates/reg_financial_distress.do new file mode 100644 index 000000000..990896ea1 --- /dev/null +++ b/input/InitialPopulations/compile/RegressionEstimates/reg_financial_distress.do @@ -0,0 +1,230 @@ +******************************************************************************** +* PROJECT: UC and mental health +* SECTION: Health and wellbeing +* OBJECT: Financial distress +* AUTHORS: Andy Baxter, Erik Igelström +* LAST UPDATE: 08 Jan 2026 +* COUNTRY: UK +* +* NOTES: +******************************************************************************** +clear all +set more off +set mem 200m +set maxvar 30000 + + +******************************************************************* +cap log close +log using "${dir_log}/reg_financial_distress.log", replace +******************************************************************* + +use "$dir_ukhls_data/ukhls_pooled_all_obs_09.dta", clear +do "$dir_do/variable_update" + + + +* Sample selection +drop if dag < 16 + + +xtset idperson swv + + +********************************************************************** +* HM1_L: GHQ12 score 0-36 of all working-age adults - baseline effects * +********************************************************************** + +logit financial_distress /// +ib11.exp_emp i.lhw_c5 D.log_income i.exp_incchange ib0.exp_poverty L.ypncp L.ypnoab /// +L.i.econ_benefits L.i.dhh_owned L.i.dcpst L.dnc L.dhe_pcs L.dhe_mcs L.ib8.drgn L.i.ydses_c5 L.dlltsd L.financial_distress /// +i.dgn L.dag L.dagsq i.deh_c3 i.dot stm /// +[pweight=dimxwt] /// +, vce(cluster idperson) + + * save raw results +matrix results = r(table) +matrix results = results[1..6,1...]' +putexcel set "$dir_raw_results/financial_distress/financial_distress", sheet("UK") replace +putexcel A3 = matrix(results), names nformat(number_d2) +putexcel J4 = matrix(e(V)) + +gen in_sample = e(sample) + +predict p + +save "$dir_validation_data/financial_distress", replace + + +scalar r2_p = e(r2_p) +scalar N = e(N) +scalar rmse = e(rmse) +scalar chi2 = e(chi2) +scalar ll = e(ll) + + +* Results + +* Note: Zeros values are eliminated + +matrix b = e(b) +matrix V = e(V) + + +* Store variance-covariance matrix + +preserve + +putexcel set "$dir_raw_results/financial_distress/var_cov", sheet("var_cov") replace +putexcel A1 = matrix(V) + +import excel "$dir_raw_results/financial_distress/var_cov", sheet("var_cov") clear + +describe +local no_vars = `r(k)' + +forvalues i = 1/2 { + egen row_sum = rowtotal(*) + drop if row_sum == 0 + drop row_sum + xpose, clear +} + +mkmat v*, matrix(var) +putexcel set "$dir_results/reg_financial_distress", sheet("UK") modify +putexcel C2 = matrix(var) + +restore + + +* Store estimated coefficients + +// Initialize a counter for non-zero coefficients +local non_zero_count = 0 +//local names : colnames b + +// Loop through each element in `b` to count non-zero coefficients +forvalues i = 1/`no_vars' { + if (b[1, `i'] != 0) { + local non_zero_count = `non_zero_count' + 1 + } +} + +// Create a new row vector to hold only non-zero coefficients +matrix nonzero_b = J(1, `non_zero_count', .) + +// Populate nonzero_b with non-zero coefficients from b +local index = 1 +forvalues i = 1/`no_vars' { + if (b[1, `i'] != 0) { + matrix nonzero_b[1, `index'] = b[1, `i'] + local index = `index' + 1 + } +} + +putexcel set "$dir_results/reg_financial_distress", sheet("UK") modify +putexcel A1 = matrix(nonzero_b'), names nformat(number_d2) + + +* Labelling + +putexcel A1 = "REGRESSOR" +putexcel A2 = "EmployedToUnemployed" // 13.exp_emp +putexcel A3 = "UnemployedToEmployed" // 31.exp_emp +putexcel A4 = "PersistentUnemployed" // 33.exp_emp +putexcel A5 = "Lhw_10" // 10.lhw_c5 +putexcel A6 = "Lhw_20" // 20.lhw_c5 +putexcel A7 = "Lhw_30" // 30.lhw_c5 +putexcel A8 = "Lhw_40" // 40.lhw_c5 +putexcel A9 = "RealIncomeChange" // D.log_income +putexcel A10 = "RealIncomeDecrease_D" // 1.exp_incchange +putexcel A11 = "NonPovertyToPoverty" // 1.exp_poverty +putexcel A12 = "PovertyToNonPoverty" // 2.exp_poverty +putexcel A13 = "PersistentPoverty" // 3.exp_poverty +putexcel A14 = "Ypncp_L1" // L.ypncp +putexcel A15 = "Ypnoab_L1" // L.ypnoab +putexcel A16 = "D_Econ_benefits" // 1L.econ_benefits +putexcel A17 = "D_Home_owner_L1" // 1L.dhh_owned +putexcel A18 = "Dcpst_Single_L1" // 2L.dcpst +putexcel A19 = "Dnc_L1" // L.dnc +putexcel A20 = "Dhe_pcs_L1" // L.dhe_pcs +putexcel A21 = "Dhe_mcs_L1" // L.dhe_mcs +putexcel A22 = "UKC" // 1L.drgn1 +putexcel A23 = "UKD" // 2L.drgn1 +putexcel A24 = "UKE" // 4L.drgn1 +putexcel A25 = "UKF" // 5L.drgn1 +putexcel A26 = "UKG" // 6L.drgn1 +putexcel A27 = "UKH" // 7L.drgn1 +putexcel A28 = "UKJ" // 9L.drgn1 +putexcel A29 = "UKK" // 10L.drgn1 +putexcel A30 = "UKL" // 11L.drgn1 +putexcel A31 = "UKM" // 12L.drgn1 +putexcel A32 = "UKN" // 13L.drgn1 +putexcel A33 = "Ydses_c5_Q2_L1" // 2L.ydses_c5 +putexcel A34 = "Ydses_c5_Q3_L1" // 3L.ydses_c5 +putexcel A35 = "Ydses_c5_Q4_L1" // 4L.ydses_c5 +putexcel A36 = "Ydses_c5_Q5_L1" // 5L.ydses_c5 +putexcel A37 = "Dlltsd_L1" // L.dlltsd +putexcel A38 = "FinancialDistress" // L.financial_distress +putexcel A39 = "Dgn" // 1.dgn +putexcel A40 = "Dag_L1" // L.dag +putexcel A41 = "Dag_sq_L1" // L.dagsq +putexcel A42 = "Deh_c3_Medium" // 2.deh_c3 +putexcel A43 = "Deh_c3_Low" // 3.deh_c3 +putexcel A44 = "EthnicityAsian" // 2.dot +putexcel A45 = "EthnicityBlack" // 3.dot +putexcel A46 = "EthnicityOther" // 4.dot +putexcel A47 = "Year_transformed" // stm +putexcel A48 = "Constant" // _cons + +putexcel B1 = "COEFFICIENT" +putexcel C1 = "EmployedToUnemployed" // 13.exp_emp +putexcel D1 = "UnemployedToEmployed" // 31.exp_emp +putexcel E1 = "PersistentUnemployed" // 33.exp_emp +putexcel F1 = "Lhw_10" // 10.lhw_c5 +putexcel G1 = "Lhw_20" // 20.lhw_c5 +putexcel H1 = "Lhw_30" // 30.lhw_c5 +putexcel I1 = "Lhw_40" // 40.lhw_c5 +putexcel J1 = "RealIncomeChange" // D.log_income +putexcel K1 = "RealIncomeDecrease_D" // 1.exp_incchange +putexcel L1 = "NonPovertyToPoverty" // 1.exp_poverty +putexcel M1 = "PovertyToNonPoverty" // 2.exp_poverty +putexcel N1 = "PersistentPoverty" // 3.exp_poverty +putexcel O1 = "Ypncp_L1" // L.ypncp +putexcel P1 = "Ypnoab_L1" // L.ypnoab +putexcel Q1 = "D_Econ_benefits" // 1L.econ_benefits +putexcel R1 = "D_Home_owner_L1" // 1L.dhh_owned +putexcel S1 = "Dcpst_Single_L1" // 2L.dcpst +putexcel T1 = "Dnc_L1" // L.dnc +putexcel U1 = "Dhe_pcs_L1" // L.dhe_pcs +putexcel V1 = "Dhe_mcs_L1" // L.dhe_mcs +putexcel W1 = "UKC" // 1L.drgn1 +putexcel X1 = "UKD" // 2L.drgn1 +putexcel Y1 = "UKE" // 4L.drgn1 +putexcel Z1 = "UKF" // 5L.drgn1 +putexcel AA1 = "UKG" // 6L.drgn1 +putexcel AB1 = "UKH" // 7L.drgn1 +putexcel AC1 = "UKJ" // 9L.drgn1 +putexcel AD1 = "UKK" // 10L.drgn1 +putexcel AE1 = "UKL" // 11L.drgn1 +putexcel AF1 = "UKM" // 12L.drgn1 +putexcel AG1 = "UKN" // 13L.drgn1 +putexcel AH1 = "Ydses_c5_Q2_L1" // 2L.ydses_c5 +putexcel AI1 = "Ydses_c5_Q3_L1" // 3L.ydses_c5 +putexcel AJ1 = "Ydses_c5_Q4_L1" // 4L.ydses_c5 +putexcel AK1 = "Ydses_c5_Q5_L1" // 5L.ydses_c5 +putexcel AL1 = "Dlltsd_L1" // L.dlltsd +putexcel AM1 = "FinancialDistress" // L.financial_distress +putexcel AN1 = "Dgn" // 1.dgn +putexcel AO1 = "Dag_L1" // L.dag +putexcel AP1 = "Dag_sq_L1" // L.dagsq +putexcel AQ1 = "Deh_c3_Medium" // 2.deh_c3 +putexcel AR1 = "Deh_c3_Low" // 3.deh_c3 +putexcel AS1 = "EthnicityAsian" // 2.dot +putexcel AT1 = "EthnicityBlack" // 3.dot +putexcel AU1 = "EthnicityOther" // 4.dot +putexcel AV1 = "Year_transformed" // stm +putexcel AW1 = "Constant" // _cons + +drop in_sample p +scalar drop r2_p N chi2 ll diff --git a/input/reg_financial_distress.xlsx b/input/reg_financial_distress.xlsx index a5c4528be..63abf8a3a 100644 Binary files a/input/reg_financial_distress.xlsx and b/input/reg_financial_distress.xlsx differ diff --git a/src/test/java/simpaths/integrationtest/expected/HealthStatistics1.csv b/src/test/java/simpaths/integrationtest/expected/HealthStatistics1.csv index 4361425be..86d6f5ce6 100644 --- a/src/test/java/simpaths/integrationtest/expected/HealthStatistics1.csv +++ b/src/test/java/simpaths/integrationtest/expected/HealthStatistics1.csv @@ -2,24 +2,24 @@ run,time,id_HealthStatistics1,demLifeSatScore1to7Avg,demLifeSatScore1to7P10,demL 1,2019.0,1,5.082882273342355,3.0,4.0,6.0,6.0,6.0,Total,9845.10078575798,94442.85714285714,47.46016576454639,32.93,41.6125,49.375,54.79,58.05,11824,51.582412043302156,37.85,48.135000000000005,54.8,57.57,60.09,11.508203653585927,6.0,8.0,10.0,13.0,19.0 1,2019.0,1,5.0900653145410795,3.0,4.0,6.0,6.0,6.0,Male,4948.7929222607045,46536.28571428571,48.49371433482308,34.439,43.38,51.0,55.48,58.3,5818,52.14620831900955,40.0,49.39,55.0,57.49,59.72,10.95496734272946,6.0,7.0,10.0,12.0,18.0 1,2019.0,1,5.075924075924076,3.0,4.0,6.0,6.0,6.0,Female,4896.3078634974345,47906.57142857143,46.45896936396954,31.587,40.71,48.63,54.2,57.33,6006,51.036263736263685,35.59700000000001,47.09,54.67,57.76,60.31,12.044122544122544,6.0,8.0,11.0,14.0,20.0 -1,2020.0,1,5.099288979177247,4.0,5.0,5.0,6.0,6.0,Total,9864.048960583908,94667.57142857142,46.03536584899494,37.00027304971955,42.53516227262855,47.41324393572812,50.67571266574632,52.87033032902951,11814,52.17845740495774,42.25576516632326,49.677349533238996,54.66456027247861,57.06611303909153,58.42843343123053,12.495412159281079,5.5370349843287165,8.676314535669135,12.194970363344012,15.985849526701086,19.69307403459438 -1,2020.0,1,5.108303249097473,4.0,5.0,5.0,6.0,6.0,Male,4962.421819593146,46695.0,47.383985779611436,39.20901973589,44.42667107212651,48.781514052392104,51.54767776573669,53.620359592812875,5817,52.57359667289635,43.91550465962647,50.380985534570584,54.736891829213405,56.97290572048745,58.25220335273802,11.763524481048512,5.013416816498344,8.127335774175966,11.540471364017257,15.163044055478055,18.81147009168079 -1,2020.0,1,5.0905452726363185,4.0,5.0,5.0,6.0,6.0,Female,4901.627140990736,47972.57142857143,44.72722475571583,35.43880994011158,41.22648509740569,45.9451213393288,49.55256663286745,51.917303123670905,5997,51.79517824511138,40.834709760259706,48.833003378983946,54.574158862383214,57.2126921034085,58.609003838500385,13.205332223359573,6.154900388119579,9.276728941370386,12.986934939435692,16.74804430772302,20.414013185439998 -1,2021.0,1,5.043783875338754,4.0,5.0,5.0,5.0,6.0,Total,9783.483778356105,93589.57142857142,45.47178414289231,39.12251021802796,43.03862987261727,46.323684910610545,48.86552999262566,50.59570927824662,11808,52.00169368112773,43.9958188012933,49.91924841602812,53.876879929457836,56.19234654092858,57.55511691219131,12.826579637999787,5.911989417423701,9.120512607494732,12.695229611980281,16.416999440444396,19.90148659469959 -1,2021.0,1,5.055889939810834,4.0,5.0,5.0,5.0,6.0,Male,4921.03969021223,46200.0,46.86752854904576,41.27820467461532,44.81433643179958,47.696642086712195,49.79172538647023,51.449056692963836,5815,52.32599715943045,45.276560183427875,50.48189542288343,53.96630026363008,56.16155474789131,57.422410995122235,12.07620331893435,5.292660852560196,8.435989352910461,12.010606124475975,15.554957198437629,18.93314748044037 -1,2021.0,1,5.032037376939763,4.0,5.0,5.0,5.0,6.0,Female,4862.444088143861,47389.57142857143,44.11749518547859,37.481048772368915,41.747349386998465,44.98408129902768,47.59076862388092,49.43245344407739,5993,51.687022443628834,42.73863310658021,49.314389943995394,53.759416268970895,56.225530582829634,57.717169079738696,13.554668791239507,6.605371367377746,9.710521107580309,13.343607293318746,17.273142902963873,20.655868728161835 -1,2022.0,1,4.994914392269877,4.0,5.0,5.0,5.0,6.0,Total,9663.78016220828,92604.28571428571,45.22967162154171,40.027973300194546,43.220278850570146,45.85021013600231,48.091233151116604,49.65810054240459,11798,51.47648448826025,44.73712915555342,49.720603366480894,52.98676256487179,55.25019642319984,56.60872859796221,12.805737075518161,5.903928458268275,9.049417981122938,12.652345279526287,16.40545555259082,19.87530565546674 -1,2022.0,1,5.006193015654567,4.0,5.0,5.0,5.0,6.0,Male,4867.432518591544,45730.142857142855,46.515280123234966,41.97114948375056,44.848515543831944,47.05675547393735,48.968794613144084,50.50160564385881,5813,51.89661898875793,45.868746603694305,50.18270812470012,53.25119769671678,55.37664117689313,56.6861714610893,12.132217763125537,5.411276202588293,8.466678875479332,12.01251943385119,15.678109590462586,19.02323346230758 -1,2022.0,1,4.983959899749373,4.0,5.0,5.0,5.0,6.0,Female,4796.347643616746,46874.142857142855,43.98100959642188,38.70893405094572,42.08289824411705,44.59182710933337,46.89009796232341,48.52823094560267,5985,51.068424028545216,43.365437928715124,49.161972492000956,52.7139916454248,55.095176524091585,56.550309289777964,13.459900444430277,6.497088524606091,9.67887017040486,13.273767774461579,17.04518846275956,20.72045217297736 +1,2020.0,1,5.1041137633316405,4.0,5.0,5.0,6.0,6.0,Total,9867.629028620691,94757.14285714286,46.06161454306233,37.05800729137269,42.587491101460316,47.432004480092814,50.68859873971846,52.87456665243567,11814,52.18030101407709,42.25576516632326,49.680919587888695,54.665894128667496,57.068693441002054,58.429207300762144,12.477151978299252,5.534893179347836,8.665287181108546,12.188744213920447,15.967226489842192,19.678480450828733 +1,2020.0,1,5.111913357400722,4.0,5.0,5.0,6.0,6.0,Male,4964.0316314330385,46728.0,47.406965541146334,39.249952833151376,44.449420566721116,48.79874828592617,51.55431716630187,53.63085567014427,5817,52.576394035910695,43.91550465962647,50.380985534570584,54.736891829213405,56.975619760277816,58.25838852247566,11.74852852524423,5.003288210730821,8.12187068455188,11.522269155861272,15.152909704327817,18.788181346366713 +1,2020.0,1,5.096548274137069,4.0,5.0,5.0,6.0,6.0,Female,4903.597397187632,48029.142857142855,44.75664426528129,35.50282075868708,41.25303679694558,45.97140874282798,49.567357263319764,51.91896318278354,5997,51.79609672726596,40.834709760259706,48.833003378983946,54.574158862383214,57.2146301348631,58.609003838500385,13.183905792943397,6.153944825084665,9.267597531236369,12.977001345457008,16.71467741966822,20.375702908186494 +1,2021.0,1,5.056487127371274,4.0,5.0,5.0,5.0,6.0,Total,9792.794512293089,93825.28571428571,45.53698910330616,39.28736596985248,43.12104798097639,46.36477346004733,48.889468511237226,50.617988764525194,11808,52.009383090433815,44.042790652756416,49.92889860573529,53.88041332456192,56.201691381397914,57.55961874748001,12.7791923652743,5.886397122941414,9.0825339687628,12.664605546067076,16.37201012423222,19.86214220228487 +1,2021.0,1,5.067239896818573,4.0,5.0,5.0,5.0,6.0,Male,4925.377486670445,46303.71428571428,46.92742305195073,41.40159875119027,44.87523275838807,47.732021438966584,49.8279563681638,51.46856479608388,5815,52.33606601671287,45.2834272075495,50.4981717416713,53.967270766420825,56.172336404468474,57.42661850385404,12.035195139163632,5.272064447569398,8.397260642314148,11.973291551300328,15.498967076850288,18.89999299643993 +1,2021.0,1,5.046053729350909,4.0,5.0,5.0,5.0,6.0,Female,4867.417025622632,47521.57142857143,44.187852875813064,37.66526858343326,41.862561637495475,45.037099440071465,47.63377495546325,49.446385918283475,5993,51.69240307770004,42.74959544099078,49.322708220092466,53.775846655603154,56.229840645013844,57.72624175507087,13.501091893028939,6.533162089878138,9.676477117306487,13.289130815898963,17.173770574514695,20.56876333606342 +1,2022.0,1,5.01398542125784,4.0,5.0,5.0,5.0,6.0,Total,9678.911095704907,92957.85714285714,45.330885675242,40.27396863022321,43.353337370720354,45.956332059413,48.13522835386524,49.696132136029526,11798,51.49339710747833,44.77671019344879,49.737904401112324,52.99920715163458,55.26618096587674,56.619139626071416,12.733576277808323,5.884717768426957,8.990776612223831,12.590363515003684,16.321618670954518,19.78447264624798 +1,2022.0,1,5.025116119043523,4.0,5.0,5.0,5.0,6.0,Male,4874.9555752692095,45903.0,46.61670536172718,42.23914809142157,45.002548062181724,47.124840978677916,49.017683151062755,50.51815597013682,5813,51.91763076988683,45.874383139673576,50.21710500279242,53.2741817975423,55.37949220045634,56.69394084423383,12.062603272014805,5.372843090248836,8.42896883124155,11.917440135003691,15.606935792574298,18.8789921386015 +1,2022.0,1,5.003174603174603,4.0,5.0,5.0,5.0,6.0,Female,4803.955520435719,47054.857142857145,44.08201853446716,38.91756527396111,42.23150893268319,44.67251584512197,46.934168913320605,48.54443392727054,5985,51.081355289670334,43.433537512409515,49.170102629911526,52.733955958548236,55.1022850401056,56.552713849871225,13.385266517186453,6.4063087478722975,9.631762564506932,13.180531379100671,16.927199640950732,20.670750153102137 2,2019.0,1,5.082882273342355,3.0,4.0,6.0,6.0,6.0,Total,9845.10078575798,94442.85714285714,47.46016576454639,32.93,41.6125,49.375,54.79,58.05,11824,51.582412043302156,37.85,48.135000000000005,54.8,57.57,60.09,11.508203653585927,6.0,8.0,10.0,13.0,19.0 2,2019.0,1,5.0900653145410795,3.0,4.0,6.0,6.0,6.0,Male,4948.7929222607045,46536.28571428571,48.49371433482308,34.439,43.38,51.0,55.48,58.3,5818,52.14620831900955,40.0,49.39,55.0,57.49,59.72,10.95496734272946,6.0,7.0,10.0,12.0,18.0 2,2019.0,1,5.075924075924076,3.0,4.0,6.0,6.0,6.0,Female,4896.3078634974345,47906.57142857143,46.45896936396954,31.587,40.71,48.63,54.2,57.33,6006,51.036263736263685,35.59700000000001,47.09,54.67,57.76,60.31,12.044122544122544,6.0,8.0,11.0,14.0,20.0 -2,2020.0,1,5.099288979177247,4.0,5.0,5.0,6.0,6.0,Total,9864.048960583908,94667.57142857142,46.03536584899494,37.00027304971955,42.53516227262855,47.41324393572812,50.67571266574632,52.87033032902951,11814,52.17845740495774,42.25576516632326,49.677349533238996,54.66456027247861,57.06611303909153,58.42843343123053,12.495412159281079,5.5370349843287165,8.676314535669135,12.194970363344012,15.985849526701086,19.69307403459438 -2,2020.0,1,5.108303249097473,4.0,5.0,5.0,6.0,6.0,Male,4962.421819593146,46695.0,47.383985779611436,39.20901973589,44.42667107212651,48.781514052392104,51.54767776573669,53.620359592812875,5817,52.57359667289635,43.91550465962647,50.380985534570584,54.736891829213405,56.97290572048745,58.25220335273802,11.763524481048512,5.013416816498344,8.127335774175966,11.540471364017257,15.163044055478055,18.81147009168079 -2,2020.0,1,5.0905452726363185,4.0,5.0,5.0,6.0,6.0,Female,4901.627140990736,47972.57142857143,44.72722475571583,35.43880994011158,41.22648509740569,45.9451213393288,49.55256663286745,51.917303123670905,5997,51.79517824511138,40.834709760259706,48.833003378983946,54.574158862383214,57.2126921034085,58.609003838500385,13.205332223359573,6.154900388119579,9.276728941370386,12.986934939435692,16.74804430772302,20.414013185439998 -2,2021.0,1,5.043783875338754,4.0,5.0,5.0,5.0,6.0,Total,9783.483778356105,93589.57142857142,45.47178414289231,39.12251021802796,43.03862987261727,46.323684910610545,48.86552999262566,50.59570927824662,11808,52.00169368112773,43.9958188012933,49.91924841602812,53.876879929457836,56.19234654092858,57.55511691219131,12.826579637999789,5.911989417423701,9.120512607494732,12.695229611980281,16.416999440444396,19.90148659469959 -2,2021.0,1,5.055889939810834,4.0,5.0,5.0,5.0,6.0,Male,4921.03969021223,46200.0,46.86752854904576,41.27820467461532,44.81433643179958,47.696642086712195,49.79172538647023,51.449056692963836,5815,52.32599715943045,45.276560183427875,50.48189542288343,53.96630026363008,56.16155474789131,57.422410995122235,12.07620331893435,5.292660852560196,8.435989352910461,12.010606124475975,15.554957198437629,18.93314748044037 -2,2021.0,1,5.032037376939763,4.0,5.0,5.0,5.0,6.0,Female,4862.444088143861,47389.57142857143,44.11749518547859,37.481048772368915,41.747349386998465,44.98408129902768,47.59076862388092,49.43245344407739,5993,51.687022443628834,42.73863310658021,49.314389943995394,53.759416268970895,56.225530582829634,57.717169079738696,13.554668791239507,6.605371367377746,9.710521107580309,13.343607293318746,17.273142902963873,20.655868728161835 -2,2022.0,1,4.994914392269877,4.0,5.0,5.0,5.0,6.0,Total,9663.78016220828,92604.28571428571,45.22967162154171,40.027973300194546,43.220278850570146,45.85021013600231,48.091233151116604,49.65810054240459,11798,51.47648448826023,44.73712915555342,49.720603366480894,52.98676256487179,55.25019642319984,56.60872859796221,12.805737075518161,5.903928458268275,9.049417981122938,12.652345279526287,16.40545555259082,19.87530565546674 -2,2022.0,1,5.006193015654567,4.0,5.0,5.0,5.0,6.0,Male,4867.432518591544,45730.142857142855,46.515280123234966,41.97114948375056,44.848515543831944,47.05675547393735,48.968794613144084,50.50160564385881,5813,51.89661898875793,45.868746603694305,50.18270812470012,53.25119769671678,55.37664117689313,56.6861714610893,12.132217763125537,5.411276202588293,8.466678875479332,12.01251943385119,15.678109590462586,19.02323346230758 -2,2022.0,1,4.983959899749373,4.0,5.0,5.0,5.0,6.0,Female,4796.347643616746,46874.142857142855,43.98100959642188,38.70893405094572,42.08289824411705,44.59182710933337,46.89009796232341,48.52823094560267,5985,51.068424028545216,43.365437928715124,49.161972492000956,52.7139916454248,55.095176524091585,56.550309289777964,13.459900444430277,6.497088524606091,9.67887017040486,13.273767774461579,17.04518846275956,20.72045217297736 \ No newline at end of file +2,2020.0,1,5.1041137633316405,4.0,5.0,5.0,6.0,6.0,Total,9867.629028620691,94757.14285714286,46.06161454306233,37.05800729137269,42.587491101460316,47.432004480092814,50.68859873971846,52.87456665243567,11814,52.18030101407709,42.25576516632326,49.680919587888695,54.665894128667496,57.068693441002054,58.429207300762144,12.477151978299252,5.534893179347836,8.665287181108546,12.188744213920447,15.967226489842192,19.678480450828733 +2,2020.0,1,5.111913357400722,4.0,5.0,5.0,6.0,6.0,Male,4964.0316314330385,46728.0,47.406965541146334,39.249952833151376,44.449420566721116,48.79874828592617,51.55431716630187,53.63085567014427,5817,52.576394035910695,43.91550465962647,50.380985534570584,54.736891829213405,56.975619760277816,58.25838852247566,11.74852852524423,5.003288210730821,8.12187068455188,11.522269155861272,15.152909704327817,18.788181346366713 +2,2020.0,1,5.096548274137069,4.0,5.0,5.0,6.0,6.0,Female,4903.597397187632,48029.142857142855,44.75664426528129,35.50282075868708,41.25303679694558,45.97140874282798,49.567357263319764,51.91896318278354,5997,51.79609672726596,40.834709760259706,48.833003378983946,54.574158862383214,57.2146301348631,58.609003838500385,13.183905792943397,6.153944825084665,9.267597531236369,12.977001345457008,16.71467741966822,20.375702908186494 +2,2021.0,1,5.056487127371274,4.0,5.0,5.0,5.0,6.0,Total,9792.794512293089,93825.28571428571,45.53698910330616,39.28736596985248,43.12104798097639,46.36477346004733,48.889468511237226,50.617988764525194,11808,52.009383090433815,44.042790652756416,49.92889860573529,53.88041332456192,56.201691381397914,57.55961874748001,12.779192365274302,5.886397122941414,9.0825339687628,12.664605546067076,16.37201012423222,19.86214220228487 +2,2021.0,1,5.067239896818573,4.0,5.0,5.0,5.0,6.0,Male,4925.377486670445,46303.71428571428,46.92742305195073,41.40159875119027,44.87523275838807,47.732021438966584,49.8279563681638,51.46856479608388,5815,52.33606601671287,45.2834272075495,50.4981717416713,53.967270766420825,56.172336404468474,57.42661850385404,12.035195139163632,5.272064447569398,8.397260642314148,11.973291551300328,15.498967076850288,18.89999299643993 +2,2021.0,1,5.046053729350909,4.0,5.0,5.0,5.0,6.0,Female,4867.417025622632,47521.57142857143,44.187852875813064,37.66526858343326,41.862561637495475,45.037099440071465,47.63377495546325,49.446385918283475,5993,51.69240307770004,42.74959544099078,49.322708220092466,53.775846655603154,56.229840645013844,57.72624175507087,13.501091893028939,6.533162089878138,9.676477117306487,13.289130815898963,17.173770574514695,20.56876333606342 +2,2022.0,1,5.01398542125784,4.0,5.0,5.0,5.0,6.0,Total,9678.911095704907,92957.85714285714,45.330885675242,40.27396863022321,43.353337370720354,45.956332059413,48.13522835386524,49.696132136029526,11798,51.49339710747833,44.77671019344879,49.737904401112324,52.99920715163458,55.26618096587674,56.619139626071416,12.733576277808323,5.884717768426957,8.990776612223831,12.590363515003684,16.321618670954518,19.78447264624798 +2,2022.0,1,5.025116119043523,4.0,5.0,5.0,5.0,6.0,Male,4874.9555752692095,45903.0,46.61670536172718,42.23914809142157,45.002548062181724,47.124840978677916,49.017683151062755,50.51815597013682,5813,51.91763076988683,45.874383139673576,50.21710500279242,53.2741817975423,55.37949220045634,56.69394084423383,12.062603272014805,5.372843090248836,8.42896883124155,11.917440135003691,15.606935792574298,18.8789921386015 +2,2022.0,1,5.003174603174603,4.0,5.0,5.0,5.0,6.0,Female,4803.955520435719,47054.857142857145,44.08201853446716,38.91756527396111,42.23150893268319,44.67251584512197,46.934168913320605,48.54443392727054,5985,51.081355289670334,43.433537512409515,49.170102629911526,52.733955958548236,55.1022850401056,56.552713849871225,13.385266517186453,6.4063087478722975,9.631762564506932,13.180531379100671,16.927199640950732,20.670750153102137 \ No newline at end of file diff --git a/src/test/java/simpaths/integrationtest/expected/Statistics1.csv b/src/test/java/simpaths/integrationtest/expected/Statistics1.csv index b4c85563c..e9edfc266 100644 --- a/src/test/java/simpaths/integrationtest/expected/Statistics1.csv +++ b/src/test/java/simpaths/integrationtest/expected/Statistics1.csv @@ -1,9 +1,9 @@ run,time,id_Statistics1,edi_p50,sIndex_p50,statYHhDispEquivNatGini,statYMktNatGini,yHhDispEquivP50,yHhQuintilesC5P20,yHhQuintilesC5P40,yHhQuintilesC5P60,yHhQuintilesC5P80,yLabP20,yLabP40,yLabP60,yLabP80 1,2019.0,1,13643.583390133683,NaN,0.0,0.0,13643.667479107155,0.0,6.51833999175728,7.9090821344821665,8.39487669904798,1015.7031862136506,1595.5475473858087,2190.490749493191,3216.4356578295665 1,2020.0,1,15900.71234301057,NaN,0.0,0.0,15900.71234301057,0.0,7.088076180135259,8.031141956880619,8.506710224623882,1172.9898846787785,1749.5408273403375,2416.9694325845585,3503.635962054756 -1,2021.0,1,15807.886928269101,NaN,0.0,0.0,15807.886928269101,0.0,7.220824954129774,8.09469510117329,8.580964490955218,1255.2279162400785,1872.7710594117166,2549.7755445091757,3637.4464012183344 -1,2022.0,1,16112.837011538813,NaN,0.0,0.0,16111.568220383782,0.0,7.28594478502956,8.108206700240562,8.57947804929593,1273.8431399224642,1888.2673261541092,2555.583259821284,3675.029763548892 +1,2021.0,1,15807.886928269101,NaN,0.0,0.0,15807.886928269101,0.0,7.220824954129774,8.09469510117329,8.580964490955218,1255.2279162400785,1872.7710594117166,2549.7755445091757,3638.0914692035926 +1,2022.0,1,16112.837011538813,NaN,0.0,0.0,16111.568220383782,0.0,7.28597153342024,8.109071579540844,8.57951743271375,1273.8431399224642,1888.3290096639555,2555.749176933975,3676.8576133715255 2,2019.0,1,13643.583390133683,NaN,0.0,0.0,13643.667479107155,0.0,6.51833999175728,7.9090821344821665,8.39487669904798,1015.7031862136506,1595.5475473858087,2190.490749493191,3216.4356578295665 2,2020.0,1,15900.71234301057,NaN,0.0,0.0,15900.71234301057,0.0,7.088076180135259,8.031141956880619,8.506710224623882,1172.9898846787785,1749.5408273403375,2416.9694325845585,3503.635962054756 -2,2021.0,1,15807.886928269101,NaN,0.0,0.0,15807.886928269101,0.0,7.220824954129774,8.09469510117329,8.580964490955218,1255.2279162400785,1872.7710594117166,2549.7755445091757,3637.4464012183344 -2,2022.0,1,16112.837011538813,NaN,0.0,0.0,16111.568220383782,0.0,7.28594478502956,8.108206700240562,8.57947804929593,1273.8431399224642,1888.2673261541092,2555.583259821284,3675.029763548892 \ No newline at end of file +2,2021.0,1,15807.886928269101,NaN,0.0,0.0,15807.886928269101,0.0,7.220824954129774,8.09469510117329,8.580964490955218,1255.2279162400785,1872.7710594117166,2549.7755445091757,3638.0914692035926 +2,2022.0,1,16112.837011538813,NaN,0.0,0.0,16111.568220383782,0.0,7.28597153342024,8.109071579540844,8.57951743271375,1273.8431399224642,1888.3290096639555,2555.749176933975,3676.8576133715255 \ No newline at end of file diff --git a/src/test/java/simpaths/integrationtest/expected/Statistics21.csv b/src/test/java/simpaths/integrationtest/expected/Statistics21.csv index c4955739f..3fba237f4 100644 --- a/src/test/java/simpaths/integrationtest/expected/Statistics21.csv +++ b/src/test/java/simpaths/integrationtest/expected/Statistics21.csv @@ -1,9 +1,9 @@ run,time,id_Statistics21,demDsbl18to29Share,demDsbl30to54Share,demDsbl55to74Share,demMarried18to29Share,demMarried30to54Share,demMarried55to74Share,demNChild18to29Avg,demNChild30to54Avg,demNChild55to74Avg,demPop18to29N,demPop30to54N,demPop55to74N,healthScore18to29Avg,healthScore30to54Avg,healthScore55to74Avg,labNoWork18to29Share,labNoWork18to54Share,labNoWork30to54Share,labNoWork55to74Share,labWorkFullTime18to29Share,labWorkFullTime30to54Share,labWorkFullTime55to74Share,labWorkPartTime18to29Share,labWorkPartTime30to54Share,labWorkPartTime55to74Share,statInvestLoss18to29Avg,statInvestLoss30to54Avg,statInvestLoss55to74Avg,statYDisp18to29Avg,statYDisp30to54Avg,statYDisp55to74Avg,statYDispGrossOfLosses18to29Avg,statYDispGrossOfLosses30to54Avg,statYDispGrossOfLosses55to75Avg,statYInvest18to29Avg,statYInvest30to54Avg,statYInvest55to74Avg,statYLab18to29Avg,statYLab30to54Avg,statYLab55to74Avg,statYPens18to29Avg,statYPens30to54Avg,statYPens55to74Avg,wealth18to29Avg,wealth30to54Avg,wealth55to74Avg,x18to29Avg,x18to54Avg,x30to54Avg,x55to74Avg,xToLeisureRatio 1,2019.0,1,0.056818181818181816,0.09244486156733928,0.1300523062291964,0.2703168044077135,0.6707336148912874,0.6131716595339991,0.28546831955922863,0.9438448302831222,0.08083689966714218,2904.0,6393.0,4206.0,3.6797520661157024,3.4509619896762085,3.1238706609605327,-0.03280974462809916,-0.04843401568540323,-0.05500624220240888,0.024626505658583042,0.5953856749311295,0.7888315344908494,0.34141702330004753,0.0946969696969697,0.06162990771155952,0.03281027104136947,0.0,0.0,0.0,42.90138650342101,-235.73251852989438,-757.7467085400431,1329.1136079319922,1863.7884002201056,1321.098886102814,0.0,0.0,0.0,434.0636850782414,594.982264159137,577.842361382952,0.0,0.0,0.0,0.0,0.0,0.0,-720.1491392879234,-1107.7139183419072,-1342.7185177749318,-1403.9198889040383,14.047551522588241 1,2020.0,1,0.05553602811950791,0.08175113761179978,0.15153631284916202,0.2186291739894552,0.6417699670484858,0.5726256983240223,0.2569420035149385,0.9060097285422878,0.08100558659217877,2845.0,6373.0,4296.0,3.6112478031634447,3.419739526125843,3.038175046554935,-0.0685618978910369,-0.07349366319372502,-0.08183963759610859,0.0019729806331471034,0.6463971880492091,0.8536011297662012,0.38337988826815644,0.07943760984182777,0.023693707829907422,0.013500931098696461,0.0,0.0,0.0,177.74529292695115,-86.8723445196822,-651.3959324665625,1463.9575143555223,2012.6485742303178,1427.4496621762946,0.0,0.0,0.0,452.55804068888983,629.2547269095696,598.9694197981935,0.0,0.0,0.0,0.0,0.0,0.0,-720.1480124876006,-1107.7677439694812,-1342.8141815251993,-1403.841594162565,6.374782073884389 -1,2021.0,1,0.05954088952654232,0.0740449614840434,0.1576773008951113,0.17467718794835008,0.6131111460462192,0.5462474179481295,0.23529411764705882,0.8677880836346487,0.08423226991048886,2788.0,6361.0,4357.0,3.5172166427546627,3.336582298380758,2.9561624971310536,-0.07371705695839315,-0.08367739727528506,-0.09544245760100613,-0.011520310626577879,0.6527977044476327,0.8767489388460934,0.40394767041542345,0.0781922525107604,0.01414871875491275,0.006426440211154464,0.0,0.0,0.0,243.94022081715434,-37.25922833921459,-612.0546826486432,1530.1524422457255,2062.2616904107854,1466.790911994214,0.0,0.0,0.0,481.5680331637875,644.8894704019575,625.5178651791215,0.0,0.0,0.0,0.0,0.0,0.0,-720.1618329444999,-1107.7869670350194,-1342.8409281126894,-1403.824252037514,0.6733706484920436 -1,2022.0,1,0.060087399854333576,0.07533490937746257,0.1726027397260274,0.13619810633648943,0.5910165484633569,0.515296803652968,0.21303714493809178,0.8327817178881008,0.08082191780821918,2746.0,6345.0,4380.0,3.4085943190094685,3.247754137115839,2.860958904109589,-0.10456249694100511,-0.0956735778041719,-0.10005307423167849,-0.024890492237442885,0.6809905316824472,0.8869976359338061,0.42168949771689496,0.0808448652585579,0.00851063829787234,0.002054794520547945,0.0,0.0,0.0,282.68025622681967,-28.80041093353111,-593.5156884789599,1568.8924776553908,2070.720507816469,1485.3299061638972,0.0,0.0,0.0,483.8843787268127,646.8139449685841,624.7138535091243,0.0,0.0,0.0,0.0,0.0,0.0,-720.2122899302651,-1107.8807464261945,-1342.963266292065,-1403.8758961656802,21.525072240888445 +1,2021.0,1,0.05954088952654232,0.0740449614840434,0.1576773008951113,0.17467718794835008,0.6131111460462192,0.5462474179481295,0.23529411764705882,0.8677880836346487,0.08423226991048886,2788.0,6361.0,4357.0,3.5175753228120517,3.3376827542839176,2.9563920128528802,-0.07371705695839315,-0.08367739727528506,-0.09544245760100613,-0.011520310626577879,0.6527977044476327,0.8767489388460934,0.40394767041542345,0.0781922525107604,0.01414871875491275,0.006426440211154464,0.0,0.0,0.0,244.03671500822497,-37.29062072085162,-612.0154685441526,1530.2489364367962,2062.2302980291483,1466.8301260987046,0.0,0.0,0.0,481.5872978554714,644.9106076971538,625.5294693978988,0.0,0.0,0.0,0.0,0.0,0.0,-720.1618329444999,-1107.7869663728059,-1342.8409270257732,-1403.824252037514,0.6733706484920436 +1,2022.0,1,0.060087399854333576,0.07533490937746257,0.1726027397260274,0.13619810633648943,0.5913317572892041,0.515296803652968,0.21303714493809178,0.8332545311268715,0.08082191780821918,2746.0,6345.0,4380.0,3.4107793153678077,3.2512214342001577,2.863013698630137,-0.10456249694100511,-0.0956735778041719,-0.10005307423167849,-0.024890492237442885,0.6809905316824472,0.8869976359338061,0.42168949771689496,0.0808448652585579,0.00851063829787234,0.002054794520547945,0.0,0.0,0.0,282.676114836456,-28.52853207524913,-593.4649228535066,1568.8883362650272,2070.992386674751,1485.3806717893506,0.0,0.0,0.0,483.92594753611274,646.9469360558707,624.7507344788916,0.0,0.0,0.0,0.0,0.0,0.0,-720.2122899302651,-1107.8800003952356,-1342.9620572224005,-1403.8758961656802,21.525072240888445 2,2019.0,1,0.056818181818181816,0.09244486156733928,0.1300523062291964,0.2703168044077135,0.6707336148912874,0.6131716595339991,0.28546831955922863,0.9438448302831222,0.08083689966714218,2904.0,6393.0,4206.0,3.6797520661157024,3.4509619896762085,3.1238706609605327,-0.03280974462809916,-0.04843401568540323,-0.05500624220240888,0.024626505658583042,0.5953856749311295,0.7888315344908494,0.34141702330004753,0.0946969696969697,0.06162990771155952,0.03281027104136947,0.0,0.0,0.0,42.90138650342101,-235.73251852989438,-757.7467085400431,1329.1136079319922,1863.7884002201056,1321.098886102814,0.0,0.0,0.0,434.0636850782414,594.982264159137,577.842361382952,0.0,0.0,0.0,0.0,0.0,0.0,-720.1491392879234,-1107.7139183419072,-1342.7185177749318,-1403.9198889040383,14.047551522588241 2,2020.0,1,0.05553602811950791,0.08175113761179978,0.15153631284916202,0.2186291739894552,0.6417699670484858,0.5726256983240223,0.2569420035149385,0.9060097285422878,0.08100558659217877,2845.0,6373.0,4296.0,3.6112478031634447,3.419739526125843,3.038175046554935,-0.0685618978910369,-0.07349366319372502,-0.08183963759610859,0.0019729806331471034,0.6463971880492091,0.8536011297662012,0.38337988826815644,0.07943760984182777,0.023693707829907422,0.013500931098696461,0.0,0.0,0.0,177.74529292695115,-86.8723445196822,-651.3959324665625,1463.9575143555223,2012.6485742303178,1427.4496621762946,0.0,0.0,0.0,452.55804068888983,629.2547269095696,598.9694197981935,0.0,0.0,0.0,0.0,0.0,0.0,-720.1480124876006,-1107.7677439694812,-1342.8141815251993,-1403.841594162565,6.374782073884389 -2,2021.0,1,0.05954088952654232,0.0740449614840434,0.1576773008951113,0.17467718794835008,0.6131111460462192,0.5462474179481295,0.23529411764705882,0.8677880836346487,0.08423226991048886,2788.0,6361.0,4357.0,3.5172166427546627,3.336582298380758,2.9561624971310536,-0.07371705695839315,-0.08367739727528506,-0.09544245760100613,-0.011520310626577879,0.6527977044476327,0.8767489388460934,0.40394767041542345,0.0781922525107604,0.01414871875491275,0.006426440211154464,0.0,0.0,0.0,243.94022081715434,-37.25922833921459,-612.0546826486432,1530.1524422457255,2062.2616904107854,1466.790911994214,0.0,0.0,0.0,481.5680331637875,644.8894704019575,625.5178651791215,0.0,0.0,0.0,0.0,0.0,0.0,-720.1618329444999,-1107.7869670350194,-1342.8409281126894,-1403.824252037514,0.6733706484920436 -2,2022.0,1,0.060087399854333576,0.07533490937746257,0.1726027397260274,0.13619810633648943,0.5910165484633569,0.515296803652968,0.21303714493809178,0.8327817178881008,0.08082191780821918,2746.0,6345.0,4380.0,3.4085943190094685,3.247754137115839,2.860958904109589,-0.10456249694100511,-0.0956735778041719,-0.10005307423167849,-0.024890492237442885,0.6809905316824472,0.8869976359338061,0.42168949771689496,0.0808448652585579,0.00851063829787234,0.002054794520547945,0.0,0.0,0.0,282.68025622681967,-28.80041093353111,-593.5156884789599,1568.8924776553908,2070.720507816469,1485.3299061638972,0.0,0.0,0.0,483.8843787268127,646.8139449685841,624.7138535091243,0.0,0.0,0.0,0.0,0.0,0.0,-720.2122899302651,-1107.8807464261945,-1342.963266292065,-1403.8758961656802,21.525072240888445 \ No newline at end of file +2,2021.0,1,0.05954088952654232,0.0740449614840434,0.1576773008951113,0.17467718794835008,0.6131111460462192,0.5462474179481295,0.23529411764705882,0.8677880836346487,0.08423226991048886,2788.0,6361.0,4357.0,3.5175753228120517,3.3376827542839176,2.9563920128528802,-0.07371705695839315,-0.08367739727528506,-0.09544245760100613,-0.011520310626577879,0.6527977044476327,0.8767489388460934,0.40394767041542345,0.0781922525107604,0.01414871875491275,0.006426440211154464,0.0,0.0,0.0,244.03671500822497,-37.29062072085162,-612.0154685441526,1530.2489364367962,2062.2302980291483,1466.8301260987046,0.0,0.0,0.0,481.5872978554714,644.9106076971538,625.5294693978988,0.0,0.0,0.0,0.0,0.0,0.0,-720.1618329444999,-1107.7869663728059,-1342.8409270257732,-1403.824252037514,0.6733706484920436 +2,2022.0,1,0.060087399854333576,0.07533490937746257,0.1726027397260274,0.13619810633648943,0.5913317572892041,0.515296803652968,0.21303714493809178,0.8332545311268715,0.08082191780821918,2746.0,6345.0,4380.0,3.4107793153678077,3.2512214342001577,2.863013698630137,-0.10456249694100511,-0.0956735778041719,-0.10005307423167849,-0.024890492237442885,0.6809905316824472,0.8869976359338061,0.42168949771689496,0.0808448652585579,0.00851063829787234,0.002054794520547945,0.0,0.0,0.0,282.676114836456,-28.52853207524913,-593.4649228535066,1568.8883362650272,2070.992386674751,1485.3806717893506,0.0,0.0,0.0,483.92594753611274,646.9469360558707,624.7507344788916,0.0,0.0,0.0,0.0,0.0,0.0,-720.2122899302651,-1107.8800003952356,-1342.9620572224005,-1403.8758961656802,21.525072240888445 \ No newline at end of file diff --git a/src/test/java/simpaths/integrationtest/expected/Statistics31.csv b/src/test/java/simpaths/integrationtest/expected/Statistics31.csv index 85d91c4ee..924dec9b9 100644 --- a/src/test/java/simpaths/integrationtest/expected/Statistics31.csv +++ b/src/test/java/simpaths/integrationtest/expected/Statistics31.csv @@ -2,8 +2,8 @@ run,time,id_Statistics31,careAdj,demFertAdj,demFertRateSim,demFertRateTarget,dem 1,2019.0,1,0.0,-0.279462622342386,0.060041407867494824,0.06092462518117112,-0.613869665517935,0.5523988206915036,0.639752445827121,0.0,0.0,0.0 1,2020.0,1,0.0,-0.2659197918000082,0.027405421507298182,0.059320659210062375,-0.5988444469664678,0.5144874442150137,0.6494882472052341,0.0,0.0,0.0 1,2021.0,1,0.0,-0.25543875103684177,0.025157232704402517,0.0570746110314559,-0.5821259283872153,0.48475994421940366,0.6444373367775469,0.0,0.0,0.0 -1,2022.0,1,0.0,-0.24930347300809638,0.021039975954313193,0.05798520015481514,-0.584760268520426,0.45628885068112685,0.6442540414107724,0.0,0.0,0.0 +1,2022.0,1,0.0,-0.24930347300809638,0.021039975954313193,0.05798520015481514,-0.584760268520426,0.456553365956884,0.6442540414107724,0.0,0.0,0.0 2,2019.0,1,0.0,-0.279462622342386,0.060041407867494824,0.06092462518117112,-0.613869665517935,0.5523988206915036,0.639752445827121,0.0,0.0,0.0 2,2020.0,1,0.0,-0.2659197918000082,0.027405421507298182,0.059320659210062375,-0.5988444469664678,0.5144874442150137,0.6494882472052341,0.0,0.0,0.0 2,2021.0,1,0.0,-0.25543875103684177,0.025157232704402517,0.0570746110314559,-0.5821259283872153,0.48475994421940366,0.6444373367775469,0.0,0.0,0.0 -2,2022.0,1,0.0,-0.24930347300809638,0.021039975954313193,0.05798520015481514,-0.584760268520426,0.45628885068112685,0.6442540414107724,0.0,0.0,0.0 \ No newline at end of file +2,2022.0,1,0.0,-0.24930347300809638,0.021039975954313193,0.05798520015481514,-0.584760268520426,0.456553365956884,0.6442540414107724,0.0,0.0,0.0 \ No newline at end of file