diff --git a/input/reg_labourSupplyUtility.xlsx b/input/reg_labourSupplyUtility.xlsx index db48d381d..8d8403ce9 100644 Binary files a/input/reg_labourSupplyUtility.xlsx and b/input/reg_labourSupplyUtility.xlsx differ diff --git a/src/main/java/simpaths/data/Parameters.java b/src/main/java/simpaths/data/Parameters.java index 2858f2f6e..8a826991e 100644 --- a/src/main/java/simpaths/data/Parameters.java +++ b/src/main/java/simpaths/data/Parameters.java @@ -18,10 +18,7 @@ import org.apache.commons.math3.distribution.MultivariateNormalDistribution; import org.apache.commons.math3.distribution.NormalDistribution; import org.apache.commons.math3.util.Pair; -import simpaths.data.startingpop.DataParser; -import simpaths.model.AnnuityRates; import simpaths.model.decisions.Grids; -import simpaths.model.enums.*; import simpaths.model.taxes.DonorTaxUnit; import simpaths.model.taxes.MatchFeature; import simpaths.model.taxes.database.TaxDonorDataParser; @@ -241,6 +238,10 @@ else if(numberOfChildren <= 5) { public static final double WEEKS_PER_MONTH = 365.25/(7.*12.); // = 4.348214286 public static final double WEEKS_PER_YEAR = 365.25 / 7.; + // Determine probability of yearly labour supply matches persisting from previous year + public static double labour_innovation_employment_persistence_probability = 0.9; + public static double labour_innovation_notinemployment_persistence_probability = 0.1; + public static final int HOURS_IN_WEEK = 24 * 7; //This is used to calculate leisure in labour supply //Is it possible for people to start going to the labour module (e.g. age 17) while they are living with parents (until age 18)? //Cannot see how its possible if it is the household that decides how much labour to supply. If someone finishes school at 17, they need to leave home before they can enter the labour market. So set age for finishing school and leaving home to 18. @@ -277,8 +278,8 @@ else if(numberOfChildren <= 5) { //public static int MAX_AGE_IN_EDUCATION;// = MAX_AGE;//30; // Max age a person can stay in education //Cannot set here, as MAX_AGE is not known yet. Now set to MAX_AGE in buildObjects in Model class. //public static int MAX_AGE_MARRIAGE;// = MAX_AGE;//75; // Max age a person can marry //Cannot set here, as MAX_AGE is not known yet. Now set to MAX_AGE in buildObjects in Model class. - private static int MIN_START_YEAR = 2011; //Minimum allowed starting point. Should correspond to the oldest initial population. - private static int MAX_START_YEAR = 2021; //Maximum allowed starting point. Should correspond to the most recent initial population. + private static int MIN_START_YEAR = 2015; //Minimum allowed starting point. Should correspond to the oldest initial population. + private static int MAX_START_YEAR = 2019; //Maximum allowed starting point. Should correspond to the most recent initial population. public static int startYear; public static int endYear; private static final int MIN_START_YEAR_TESTING = 2019; @@ -1139,10 +1140,10 @@ else if(country.equals(Country.UK)) { columnsEmploymentSelectionFemalesE = 29; columnsLabourSupplyUtilityMales = 19; columnsLabourSupplyUtilityFemales = 12; - columnsLabourSupplyUtilityMalesWithDependent = 23; - columnsLabourSupplyUtilityFemalesWithDependent = 23; - columnsLabourSupplyUtilityACMales = 17; - columnsLabourSupplyUtilityACFemales = 17; + columnsLabourSupplyUtilityMalesWithDependent = 15; + columnsLabourSupplyUtilityFemalesWithDependent = 15; + columnsLabourSupplyUtilityACMales = 31; + columnsLabourSupplyUtilityACFemales = 31; columnsLabourSupplyUtilityCouples = 64; columnsLabourCovid19_SE = 1; columnsLabourCovid19_2a_processes = 1; diff --git a/src/main/java/simpaths/model/BenefitUnit.java b/src/main/java/simpaths/model/BenefitUnit.java index 93b30f838..67e37d580 100644 --- a/src/main/java/simpaths/model/BenefitUnit.java +++ b/src/main/java/simpaths/model/BenefitUnit.java @@ -95,6 +95,8 @@ public class BenefitUnit implements EventListener, IDoubleSource, Weight, Compar @Transient ArrayList> covid19MonthlyStateAndGrossIncomeAndWorkHoursTripleFemale = new ArrayList<>(); // This ArrayList stores monthly values of labour market states and gross incomes, to be sampled from by the LabourMarket class, for the female member of the benefit unit @Transient Innovations innovations; + @Transient private Double lastLabourInnov; + @Transient private Integer lastYear; @Transient private Integer yearLocal; @Transient private Occupancy occupancyLocal; @@ -153,7 +155,7 @@ public BenefitUnit(Long id, long seed) { key = new PanelEntityKey(id); //Sets up key this.seed = seed; - innovations = new Innovations(9, seed); + innovations = new Innovations(9, 1, seed); this.numberChildrenAll_lag1 = 0; this.numberChildren02_lag1 = 0; @@ -1108,7 +1110,28 @@ protected void updateLabourSupplyAndIncome() { } //Sample labour supply from possible labour (pairs of) values - double labourInnov = innovations.getDoubleDraw(5); + double labourInnov = 0; + + // Check if: + // - single occupant is employed + // - or male of couple is employed + // - or male is not at risk of work and female is employed + // -> then persist employment at prob_{persist_employment} + // Otherwise + // -> persist unemployment at prob_{persist_unemployment} + + if (occupancy.Single_Male.equals(occupancy) && male.atRiskOfWork() && male.getEmployed() == 1) { + labourInnov = getLabourInnovation(Parameters.labour_innovation_employment_persistence_probability); + } else if (occupancy.Single_Female.equals(occupancy) && female.atRiskOfWork() && female.getEmployed() == 1) { + labourInnov = getLabourInnovation(Parameters.labour_innovation_employment_persistence_probability); + } else if (occupancy.equals(Occupancy.Couple) && + ((male.atRiskOfWork() && male.getEmployed() == 1) || + (!male.atRiskOfWork() && female.atRiskOfWork() && female.getEmployed() == 1))) { + labourInnov = getLabourInnovation(Parameters.labour_innovation_employment_persistence_probability); + } else { + labourInnov = getLabourInnovation(Parameters.labour_innovation_notinemployment_persistence_probability); + } + try { MultiKeyMap labourSupplyUtilityRegressionProbabilitiesByLabourPairs = convertRegressionScoresToProbabilities(labourSupplyUtilityRegressionScoresByLabourPairs); labourSupplyChoice = ManagerRegressions.multiEvent(labourSupplyUtilityRegressionProbabilitiesByLabourPairs, labourInnov); @@ -1529,6 +1552,30 @@ public enum Regressors { MaleEduH_30, MaleEduM_40, MaleEduH_40, + MaleEduM_1, + MaleEduH_1, + MaleEduM_2, + MaleEduH_2, + MaleEduM_3, + MaleEduH_3, + MaleEduM_4, + MaleEduH_4, + FemaleEduM_10, + FemaleEduH_10, + FemaleEduM_20, + FemaleEduH_20, + FemaleEduM_30, + FemaleEduH_30, + FemaleEduM_40, + FemaleEduH_40, + FemaleEduM_1, + FemaleEduH_1, + FemaleEduM_2, + FemaleEduH_2, + FemaleEduM_3, + FemaleEduH_3, + FemaleEduM_4, + FemaleEduH_4, MaleLeisure_dnc, FemaleLeisure_dnc, MaleLeisure_dnc02, @@ -2416,6 +2463,78 @@ public double getDoubleValue(Enum variableID) { case MaleEduH_40 -> { return (getMale() != null && getMale().getLabourSupplyWeekly().equals(Labour.FORTY) && getMale().getDeh_c3().equals(Education.High)) ? 1. : 0.; } + case MaleEduM_1 -> { + return (getMale() != null && getFemale() != null && getFemale().getLabourSupplyWeekly().equals(Labour.TEN) && getMale().getDeh_c3().equals(Education.Medium)) ? 1. : 0.; + } + case MaleEduH_1 -> { + return (getMale() != null && getFemale() != null && getFemale().getLabourSupplyWeekly().equals(Labour.TEN) && getMale().getDeh_c3().equals(Education.High)) ? 1. : 0.; + } + case MaleEduM_2 -> { + return (getMale() != null && getFemale() != null && getFemale().getLabourSupplyWeekly().equals(Labour.TWENTY) && getMale().getDeh_c3().equals(Education.Medium)) ? 1. : 0.; + } + case MaleEduH_2 -> { + return (getMale() != null && getFemale() != null && getFemale().getLabourSupplyWeekly().equals(Labour.TWENTY) && getMale().getDeh_c3().equals(Education.High)) ? 1. : 0.; + } + case MaleEduM_3 -> { + return (getMale() != null && getFemale() != null && getFemale().getLabourSupplyWeekly().equals(Labour.THIRTY) && getMale().getDeh_c3().equals(Education.Medium)) ? 1. : 0.; + } + case MaleEduH_3 -> { + return (getMale() != null && getFemale() != null && getFemale().getLabourSupplyWeekly().equals(Labour.THIRTY) && getMale().getDeh_c3().equals(Education.High)) ? 1. : 0.; + } + case MaleEduM_4 -> { + return (getMale() != null && getFemale() != null && getFemale().getLabourSupplyWeekly().equals(Labour.FORTY) && getMale().getDeh_c3().equals(Education.Medium)) ? 1. : 0.; + } + case MaleEduH_4 -> { + return (getMale() != null && getFemale() != null && getFemale().getLabourSupplyWeekly().equals(Labour.FORTY) && getMale().getDeh_c3().equals(Education.High)) ? 1. : 0.; + } + case FemaleEduM_10 -> { + return (getMale() != null && getFemale() != null && getMale().getLabourSupplyWeekly().equals(Labour.TEN) && getFemale().getDeh_c3().equals(Education.Medium)) ? 1. : 0.; + } + case FemaleEduH_10 -> { + return (getMale() != null && getFemale() != null && getMale().getLabourSupplyWeekly().equals(Labour.TEN) && getFemale().getDeh_c3().equals(Education.High)) ? 1. : 0.; + } + case FemaleEduM_20 -> { + return (getMale() != null && getFemale() != null && getMale().getLabourSupplyWeekly().equals(Labour.TWENTY) && getFemale().getDeh_c3().equals(Education.Medium)) ? 1. : 0.; + } + case FemaleEduH_20 -> { + return (getMale() != null && getFemale() != null && getMale().getLabourSupplyWeekly().equals(Labour.TWENTY) && getFemale().getDeh_c3().equals(Education.High)) ? 1. : 0.; + } + case FemaleEduM_30 -> { + return (getMale() != null && getFemale() != null && getMale().getLabourSupplyWeekly().equals(Labour.THIRTY) && getFemale().getDeh_c3().equals(Education.Medium)) ? 1. : 0.; + } + case FemaleEduH_30 -> { + return (getMale() != null && getFemale() != null && getMale().getLabourSupplyWeekly().equals(Labour.THIRTY) && getFemale().getDeh_c3().equals(Education.High)) ? 1. : 0.; + } + case FemaleEduM_40 -> { + return (getMale() != null && getFemale() != null && getMale().getLabourSupplyWeekly().equals(Labour.FORTY) && getFemale().getDeh_c3().equals(Education.Medium)) ? 1. : 0.; + } + case FemaleEduH_40 -> { + return (getMale() != null && getFemale() != null && getMale().getLabourSupplyWeekly().equals(Labour.FORTY) && getFemale().getDeh_c3().equals(Education.High)) ? 1. : 0.; + } + case FemaleEduM_1 -> { + return (getMale() != null && getFemale() != null && getFemale().getLabourSupplyWeekly().equals(Labour.TEN) && getFemale().getDeh_c3().equals(Education.Medium)) ? 1. : 0.; + } + case FemaleEduH_1 -> { + return (getMale() != null && getFemale() != null && getFemale().getLabourSupplyWeekly().equals(Labour.TEN) && getFemale().getDeh_c3().equals(Education.High)) ? 1. : 0.; + } + case FemaleEduM_2 -> { + return (getMale() != null && getFemale() != null && getFemale().getLabourSupplyWeekly().equals(Labour.TWENTY) && getFemale().getDeh_c3().equals(Education.Medium)) ? 1. : 0.; + } + case FemaleEduH_2 -> { + return (getMale() != null && getFemale() != null && getFemale().getLabourSupplyWeekly().equals(Labour.TWENTY) && getFemale().getDeh_c3().equals(Education.High)) ? 1. : 0.; + } + case FemaleEduM_3 -> { + return (getMale() != null && getFemale() != null && getFemale().getLabourSupplyWeekly().equals(Labour.THIRTY) && getFemale().getDeh_c3().equals(Education.Medium)) ? 1. : 0.; + } + case FemaleEduH_3 -> { + return (getMale() != null && getFemale() != null && getFemale().getLabourSupplyWeekly().equals(Labour.THIRTY) && getFemale().getDeh_c3().equals(Education.High)) ? 1. : 0.; + } + case FemaleEduM_4 -> { + return (getMale() != null && getFemale() != null && getFemale().getLabourSupplyWeekly().equals(Labour.FORTY) && getFemale().getDeh_c3().equals(Education.Medium)) ? 1. : 0.; + } + case FemaleEduH_4 -> { + return (getMale() != null && getFemale() != null && getFemale().getLabourSupplyWeekly().equals(Labour.FORTY) && getFemale().getDeh_c3().equals(Education.High)) ? 1. : 0.; + } case MaleLeisure_dnc02 -> { return (Parameters.HOURS_IN_WEEK - getMale().getLabourSupplyHoursWeekly()) * getIndicatorChildren(0,1).ordinal(); } @@ -3646,4 +3765,55 @@ public void removeMember(Person member) { } public static void setBenefitUnitIdCounter(long id) {benefitUnitIdCounter = id;} + + /** + * Calculates the labour innovation value for the current period with persistence. + * + * This method implements a persistence mechanism for labour innovations where there's + * a probability that the previous period's innovation will persist into the current period. + * A new innovation is drawn each period, but it's only used with probability (1 - persistenceProbability). + * + * The persistence mechanism works as follows: + * 1. Draw a new potential innovation value + * 2. Draw a random number to determine if we should use the new value or persist with the old one + * 3. If it's the first period or there was a gap in years, use the new innovation + * 4. Otherwise, use the persistence probability to decide between new and old values + * + * @param persistenceProbability The probability (between 0 and 1) that the previous period's + * innovation will persist. A value of 0 means always use new innovations, + * while 1 means always keep the old innovation. + * @return The labour innovation value for this period + */ + private double getLabourInnovation(double persistenceProbability) { + + double newLabourInnovation = innovations.getDoubleDraw(5); + + // persistenceRandomDraw - random value to determine if we keep old innovation + double persistenceRandomDraw = innovations.getDoubleDraw(6); + + int currentYear = model.getYear(); + + // Initialize on first call + if (lastLabourInnov == null || lastYear == null) { + lastLabourInnov = newLabourInnovation; + lastYear = currentYear; + return newLabourInnovation; + } + + double labourInnov; + if (persistenceRandomDraw < persistenceProbability) { + labourInnov = lastLabourInnov; + } else { + labourInnov = newLabourInnovation; + } + + // Store values for next period + lastLabourInnov = labourInnov; + lastYear = currentYear; + + return labourInnov; + + + + } } diff --git a/src/main/java/simpaths/model/Innovations.java b/src/main/java/simpaths/model/Innovations.java index f097dca23..9200202c3 100644 --- a/src/main/java/simpaths/model/Innovations.java +++ b/src/main/java/simpaths/model/Innovations.java @@ -28,6 +28,14 @@ public Innovations(int nDoubleInnovs, int nSingleDrawDoubleInnovs, int nSingleDr } } + public Innovations(int nDoubleInnovs, int nSingleDrawDoubleInnovs, long seed) { + this(nDoubleInnovs, seed); + singleDrawDoubleInnovs = new double[nSingleDrawDoubleInnovs]; + for (int ii = 0; ii < nSingleDrawDoubleInnovs; ii++) { + singleDrawDoubleInnovs[ii] = generator.nextDouble(); + } + } + public void getNewDoubleDraws() { for (int ii = 0; ii < doubleInnovs.length; ii++) { doubleInnovs[ii] = generator.nextDouble(); diff --git a/src/test/java/simpaths/integrationtest/expected/HealthStatistics1.csv b/src/test/java/simpaths/integrationtest/expected/HealthStatistics1.csv index e802f447e..b092ef2f3 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,N,dhe_mcs_mean,dhe_mcs_median,dhe_mcs_p_10,dhe_mcs 1,2019.0,1,11902,47.30721811460221,49.35,32.26,41.45,54.79,58.05,51.70883296924949,55.0,37.81,48.51,57.76,60.05,11.445975466308184,10.0,6.0,8.0,13.0,19.0,5.067467652495379,6.0,3.0,4.0,6.0,6.0,Total,9902.827300271847,94777.57142857142, 1,2019.0,1,5856,48.561132172131245,50.94,34.86600000000001,43.67,55.32,58.15,52.27532957650251,55.0,40.101,49.66,57.57,59.706,10.75785519125683,10.0,6.0,7.0,12.0,17.0,5.079747267759563,5.0,3.0,5.0,6.0,6.0,Male,4989.684197937943,46745.28571428571, 1,2019.0,1,6046,46.092709229242594,48.254999999999995,30.61,39.8,54.37,57.563,51.160138934832624,54.8,35.597,47.402499999999996,57.76,60.45,12.112471055243136,11.0,6.0,8.0,14.0,21.0,5.0555739331789615,6.0,3.0,4.0,6.0,6.0,Female,4913.143102333966,48032.28571428571, -1,2020.0,1,11976,46.72832619040652,48.08980323184798,37.69543150953802,43.361108550006364,51.37157610021508,53.63930517823313,51.74949468518574,54.2649610417665,41.16810434703805,49.40252359938471,56.73980162102518,58.15257530408564,11.906766716412813,11.64842029301263,4.954278112429778,8.11388417250247,15.328645293806876,19.140698935141263,5.067134268537074,5.0,4.0,5.0,6.0,6.0,Total,9997.228426578713,95360.57142857142, -1,2020.0,1,5889,47.83804426198243,49.17860989172812,39.515630612386964,44.93689230425686,51.995375198954605,54.03766204187945,52.4284551631501,54.558668951178106,43.392317473070015,50.4228839322339,56.86949930101061,58.290622980067596,11.262894345574994,11.121208659030795,4.317971986590164,7.460696965431441,14.66632526420898,18.377117494975813,5.049244353880115,5.0,4.0,5.0,6.0,6.0,Male,5032.90580885152,46726.42857142857, -1,2020.0,1,6087,45.654705404549766,46.90555372234271,36.34465366241071,41.88598313105092,50.63961110116057,53.03376313818601,51.09261966387308,53.935153383331354,39.12342011493392,48.015245376954915,56.59059927865347,58.00587073407303,12.529694988445774,12.228766243009813,5.670496473718608,8.78046904384623,15.933974441983647,19.815380212714583,5.0844422539839,5.0,4.0,5.0,6.0,6.0,Female,4964.322617727217,48634.142857142855, -1,2021.0,1,11874,46.291068569056065,47.10706207230591,40.07718740053329,43.83154221769657,49.48251641119677,51.24838306845953,51.47783693413585,53.20250727059096,42.966525817975594,49.1721101700904,55.70218998096231,57.29091619471434,12.195579873290818,12.072214207111887,5.208481167538091,8.498517489941484,15.78599840272461,19.214114994977262,5.063415866599293,5.0,4.0,5.0,5.0,6.0,Total,9849.227404232895,94479.0, -1,2021.0,1,5831,47.27277272654642,48.02369055431281,41.45492582736063,45.14750871272122,50.21445770214629,51.783261551467504,52.18276248476246,53.67132421263138,44.72330377345864,50.2668135828954,56.026341813600105,57.46613194417552,11.504381845986451,11.396706985140513,4.658130043625977,7.736783187557731,15.077311758749596,18.40109130664797,5.019893671754416,5.0,4.0,5.0,5.0,6.0,Male,4946.139341073336,45997.28571428571, -1,2021.0,1,6043,45.3438044713683,46.135020125817135,39.009366063691346,42.71463957680296,48.5967000494249,50.48730934877902,50.79764152031741,52.66299302124695,41.32293602900034,48.04826198049429,55.38693170089868,57.05756992526538,12.86252935156511,12.697463247853737,5.94170677939208,9.245442455643714,16.40081475215643,20.035274548045106,5.105411219592917,5.0,4.0,5.0,5.0,6.0,Female,4903.088063159504,48481.71428571428, -1,2022.0,1,11975,46.02430166527589,46.46460520353698,41.24832587431683,43.8880835800033,48.62483038209371,50.158085187271034,51.25104630211261,52.511495769835605,44.18592673290397,48.93918263974426,54.99576950299433,56.594622624265014,12.308725371636235,12.254110566666713,5.271839257323182,8.53479380982754,15.943525192165108,19.397020265883576,5.021711899791232,5.0,4.0,5.0,5.0,6.0,Total,9875.610139839637,94497.85714285714, -1,2022.0,1,5894,46.94653504952411,47.429939957135545,42.36306618461769,45.14164291619305,49.391791952890856,50.77720827942039,51.96966726563396,53.168607589988596,45.572223290892296,49.88626934454144,55.36021586952833,56.81834228154301,11.697377359436786,11.624267058032856,4.694147042245456,7.883553214395921,15.346892448459485,18.74057741380655,4.971835765184934,5.0,4.0,5.0,5.0,6.0,Male,4968.320727071248,46049.142857142855, -1,2022.0,1,6081,45.1304283604314,45.50419159539822,40.472730915400426,43.0932923092967,47.65583883554637,49.26739154240824,50.554524026336416,51.87596007042983,42.62852611098334,47.992510166302495,54.5392391876573,56.29054512373861,12.901273502520073,12.858255957444612,5.928938827956924,9.269721378614172,16.469958809696145,19.9359842955144,5.070054267390232,5.0,4.0,5.0,5.0,6.0,Female,4907.2894127683685,48448.71428571428, +1,2020.0,1,11981,46.72312136392721,48.04494858058307,37.680373488088165,43.38161489757194,51.38474185202722,53.64795268137994,51.765955612668826,54.24083679924295,41.22755964150669,49.44306849997008,56.71107151500211,58.14237871243326,11.921686710010285,11.65734477115363,4.970178783684035,8.114008964647638,15.32457060396705,19.138540227268123,5.067356648026041,5.0,4.0,5.0,6.0,6.0,Total,10003.39903012421,95404.57142857142, +1,2020.0,1,5897,47.855774955783694,49.17495713284899,39.559454484990795,44.926002831177726,52.0992069483123,54.029694284179506,52.4440584462621,54.545609703728736,43.4583718360682,50.41507663502588,56.85274491374925,58.316380042250465,11.263307306264204,11.10356275839635,4.348064035471328,7.45337271945913,14.669243317843964,18.32399445386213,5.051551636425301,5.0,4.0,5.0,6.0,6.0,Male,5041.8859341865855,46811.28571428571, +1,2020.0,1,6084,45.62528141797404,46.85801387586436,36.29251209132451,41.841245334933625,50.58553438199722,53.01609961125867,51.108695190298924,53.91126738679253,39.169879058683335,48.01947303599382,56.55203615606599,57.96690373453018,12.559829928927341,12.229681806092499,5.747766978923296,8.776579756344919,15.955841422074833,19.824028039356577,5.082675871137409,5.0,4.0,5.0,6.0,6.0,Female,4961.513095937661,48593.28571428571, +1,2021.0,1,11863,46.295707930005904,47.051674099875484,39.96717929437476,43.87442444687362,49.52548002207875,51.33427971728777,51.482506180391596,53.16862009350822,43.10242072984096,49.231977366858914,55.67063841347256,57.231407310813545,12.159078178609215,12.073589943324254,5.183109240177758,8.439993356643813,15.768381601850242,19.212113866002706,5.063053190592599,5.0,4.0,5.0,5.0,6.0,Total,9840.553081744609,94384.71428571429, +1,2021.0,1,5821,47.328725875001616,48.053610340410174,41.44830552565315,45.19923674312915,50.30162279035925,51.88980846434084,52.17738310136268,53.61939640894258,44.70414307646928,50.334916565705754,55.98577075137926,57.44007888623527,11.463865546261683,11.330071235437774,4.650269298359842,7.686108340958541,15.073041731046093,18.367500094446893,5.028173853289813,5.0,4.0,5.0,5.0,6.0,Male,4940.140369251287,45994.142857142855, +1,2021.0,1,6042,45.30047498432237,46.063120834335194,38.896358930553184,42.708846603313454,48.59883075824878,50.54983749415912,50.813045975662625,52.68899901872369,41.424739137540435,48.164843055306186,55.325386507637596,56.99128695474984,12.828861815301495,12.701492230982865,5.838473759695907,9.16748002058487,16.380322947110432,19.908886015933586,5.096656736180073,5.0,4.0,5.0,5.0,6.0,Female,4900.412712493269,48390.57142857143, +1,2022.0,1,11977,46.06305259058377,46.47388742192936,41.215405916122336,43.947787275203794,48.668599575426924,50.30435022694322,51.27441254444169,52.47454876465925,44.25331401715322,49.022486771543235,54.97283755637872,56.53510899076613,12.251407330879982,12.142927411659688,5.231523238049544,8.483773761458854,15.89843431813457,19.32900542006405,5.027970276363029,5.0,4.0,5.0,5.0,6.0,Total,9884.250550477438,94631.42857142857, +1,2022.0,1,5894,47.071192505892576,47.51746455366359,42.46479377041369,45.25783775983857,49.472987182547826,50.90467465809678,52.00920201633001,53.10284623760023,45.70251994045883,50.08915255779006,55.36144463451229,56.76225443075914,11.607848662750644,11.574239414222026,4.710883041487559,7.911330618889085,15.13731982622563,18.544746566834647,4.987275195113675,5.0,4.0,5.0,5.0,6.0,Male,4978.263100399822,46192.142857142855, +1,2022.0,1,6083,45.08623577966321,45.42827994859914,40.31802464218546,43.05200544970396,47.66805723234662,49.36005346116027,50.562453125190274,51.86203422170384,42.8102151421313,48.11356139958275,54.46999604984297,56.18745971185164,12.874970505293025,12.812210388591994,5.846063701310104,9.133512760352872,16.514108822266365,19.926013019159278,5.067400953476903,5.0,4.0,5.0,5.0,6.0,Female,4905.9874500775895,48439.28571428571, 2,2019.0,1,11909,47.31729700226682,49.35,32.26,41.45,54.79,58.05,51.702850785121164,55.0,37.81,48.49,57.76,60.06,11.44394995381644,10.0,6.0,8.0,13.0,19.0,5.0694432781929635,6.0,3.0,4.0,6.0,6.0,Total,9908.06190773439,94870.28571428571, 2,2019.0,1,5860,48.567005119454016,50.99,34.891,43.655,55.355000000000004,58.15,52.2732218430032,55.0,40.071,49.66,57.69,59.71800000000001,10.761262798634812,10.0,6.0,7.0,12.0,17.0,5.080204778156997,5.0,3.0,5.0,6.0,6.0,Male,4992.726818634938,46781.42857142857, 2,2019.0,1,6049,46.10663580757162,48.28,30.61,39.8,54.37,57.59,51.15030087617755,54.8,35.59,47.38,57.76,60.45,12.105306662258224,11.0,6.0,8.0,14.0,21.0,5.059018019507357,6.0,3.0,4.0,6.0,6.0,Female,4915.3350890995125,48088.857142857145, -2,2020.0,1,11924,46.73391482715365,48.08720457588895,37.68556603699029,43.388041901434,51.36348085232591,53.634452721148406,51.741674105563604,54.245976303161164,41.13579733766489,49.391873062380405,56.74725570057244,58.161189063985,11.909996096318611,11.65556129166259,4.955414333628617,8.107965102991283,15.336790666195782,19.143523963554316,5.069104327406911,5.0,4.0,5.0,6.0,6.0,Total,9953.310376289028,94983.42857142857, -2,2020.0,1,5863,47.83269132912934,49.16553604616488,39.51243866654815,44.93407720740975,51.983355920336905,54.020041799992086,52.41696722067078,54.55909734088675,43.38336193770499,50.4037627352858,56.89553907438531,58.297491302667815,11.287471617389132,11.101995202380232,4.350756239146561,7.473186498730327,14.68659847766413,18.405541472866226,5.04912161009722,5.0,4.0,5.0,6.0,6.0,Male,5009.171314336577,46519.0, -2,2020.0,1,6061,45.67103302034228,46.9172525392799,36.38755573378921,41.94628878614605,50.621296762353865,53.043660750641635,51.088441382601744,53.89420134705162,39.11149047662418,48.02938643744151,56.588851504703165,58.01276596459567,12.512184022397461,12.229975478696778,5.610742317623197,8.758861986517127,15.906925188945998,19.7927314273779,5.088434251773634,5.0,4.0,5.0,6.0,6.0,Female,4944.139061952518,48464.42857142857, -2,2021.0,1,11869,46.29384721312216,47.09872511823885,40.037047448872364,43.8729710116588,49.48306805420589,51.25289982801223,51.460914919333455,53.1720548318975,42.96600742224982,49.168131607191796,55.685989091442096,57.291817220464026,12.187742714407502,12.070633736528022,5.253045257980679,8.467867318841051,15.754469607355983,19.234867961037867,5.0627685567444605,5.0,4.0,5.0,5.0,6.0,Total,9842.514778323542,94427.14285714286, -2,2021.0,1,5829,47.28258636271155,48.02555344624849,41.39633836574434,45.19197423380547,50.21677114400871,51.80688094202381,52.156500921720614,53.64140351890379,44.67272308057912,50.22269925260798,56.01718741661837,57.475750330227136,11.516626943999322,11.469437712468189,4.733610917396593,7.712441315244608,15.093313903865372,18.409108858115495,5.01578315319952,5.0,4.0,5.0,5.0,6.0,Male,4942.808720200981,45943.857142857145, -2,2021.0,1,6040,45.339648454354155,46.104636259909825,38.9869689963329,42.72842374868197,48.59844235237214,50.49848245978352,50.78962836173174,52.63970095391764,41.36602506047597,48.061428760101535,55.342530699306465,57.03832907882594,12.835413877604392,12.680322573945821,5.929364071925647,9.20325688232084,16.379425214654127,20.063605473906403,5.108112582781457,5.0,4.0,5.0,5.0,6.0,Female,4899.706058122516,48483.28571428571, -2,2022.0,1,11993,46.03781040207975,46.47155073352924,41.26425081485816,43.92384143194711,48.624034357297994,50.15641795364081,51.25075493117954,52.47096848801269,44.19047284695333,48.95510962434002,54.993780925137465,56.591290533779734,12.307658555975555,12.253392693577032,5.258601124938844,8.542794626181273,15.956765486275383,19.38195326964699,5.024681063953973,5.0,4.0,5.0,5.0,6.0,Total,9891.715581333478,94695.85714285714, -2,2022.0,1,5907,46.957524592629234,47.4679596800407,42.34930101344604,45.14609116423034,49.381266615483796,50.760367418633635,51.967048361790766,53.12235664801049,45.595703907792114,49.94999495144039,55.38843611946553,56.84762032751317,11.693845206438887,11.650654382101958,4.692997925518093,7.877866156187055,15.39250881515423,18.76535844400623,4.973929236499069,5.0,4.0,5.0,5.0,6.0,Male,4979.653421649741,46170.142857142855, -2,2022.0,1,6086,45.14514662889964,45.53061079587332,40.37031637512513,43.139292423478366,47.68147997796842,49.29238851811128,50.55552895440931,51.88537833324895,42.79639807655578,48.03360167451064,54.494290716110605,56.2682743502057,12.903418571702552,12.867194159401244,5.929962787914532,9.219803444816403,16.502949102803836,19.93324172854457,5.07394019060138,5.0,4.0,5.0,5.0,6.0,Female,4912.062159683744,48525.71428571428, \ No newline at end of file +2,2020.0,1,11956,46.721774338725986,48.04710000866561,37.69543150953802,43.379450749206136,51.38716403354744,53.64139899812946,51.738298031333294,54.232090865756476,41.15779768378626,49.36446199516808,56.70295313131399,58.142913228706206,11.90860278913425,11.65872417965457,4.9515133035940515,8.094261815582241,15.301262224290678,19.131595932767627,5.068835731013717,5.0,4.0,5.0,6.0,6.0,Total,9977.775716945813,95233.28571428571, +2,2020.0,1,5881,47.836939495264765,49.153707803879044,39.51103268625826,44.84800286606517,52.10507245285193,54.010710183290115,52.40247210130872,54.537369926286026,43.275165743185106,50.35424505495823,56.86319835362991,58.31010412053384,11.27527583743656,11.101655927160161,4.361561027941537,7.440680984609228,14.68822623272522,18.376009551411823,5.0508416935895255,5.0,4.0,5.0,6.0,6.0,Male,5023.583699808351,46677.71428571428, +2,2020.0,1,6075,45.642221040683594,46.86852754005157,36.38793840053828,41.85765937313275,50.59543548723383,53.02752152621597,51.09533379997087,53.86922797176714,39.23843279362984,47.97556556903878,56.531480242385854,57.975376087778635,12.52170497891768,12.207115195785864,5.696202986385561,8.757875777725456,15.920310043518128,19.776232340708912,5.086255144032922,5.0,4.0,5.0,6.0,6.0,Female,4954.192017137515,48555.57142857143, +2,2021.0,1,11886,46.31609942778674,47.063137069325364,40.02276080666079,43.850698229685996,49.54492186895276,51.35363066847725,51.47300362753454,53.16189458280667,42.97634983621588,49.196127879132966,55.68083990626609,57.27062559412911,12.17915565710274,12.100602290383208,5.218699719647239,8.446857675509074,15.795002680051452,19.21725476056887,5.070166582534074,5.0,4.0,5.0,5.0,6.0,Total,9860.90260100513,94700.57142857142, +2,2021.0,1,5838,47.33946182740971,48.076291199962256,41.399668299094344,45.23710019279133,50.34725800412161,51.8991627586113,52.14624932902758,53.62086567581238,44.64594112333975,50.285139404417066,56.020623340333906,57.450826719636794,11.491214049914955,11.373381979438726,4.707132290779077,7.698634045720711,15.123803216321395,18.415905423648006,5.032374100719425,5.0,4.0,5.0,5.0,6.0,Male,4952.691767675137,46167.0, +2,2021.0,1,6048,45.328270444817164,46.10905566036046,38.98721613933031,42.70790195186013,48.59904472686274,50.54338499050335,50.82313451289965,52.650883615292685,41.534267915667364,48.152924071396654,55.33760437448938,57.014199773565494,12.843210402929861,12.701492230982865,5.870306082270336,9.189226488974729,16.40869353461438,19.905008852413687,5.106646825396825,5.0,4.0,5.0,5.0,6.0,Female,4908.210833330007,48533.57142857143, +2,2022.0,1,11965,46.075319777235336,46.482801363409166,41.187126784751726,43.926137972572036,48.677112742649044,50.321342261392644,51.267669765145605,52.47326044732995,44.276160254729284,48.98271054633243,54.98744735933069,56.553972184098285,12.247519868549224,12.163604696596549,5.165222926438087,8.497361491595687,15.86840534413765,19.31945172945557,5.033430839949854,5.0,4.0,5.0,5.0,6.0,Total,9875.246080194123,94639.28571428571, +2,2022.0,1,5888,47.07071094209487,47.54065074624904,42.42705081524239,45.254021927520974,49.47416259811738,50.88541301281929,51.98134786361458,53.09496993691977,45.61372869758042,50.05305685420348,55.38455121475831,56.77941978331234,11.57751524767851,11.611354972957763,4.600949416100249,7.84093479334605,15.123215841700327,18.51460773309882,4.992866847826087,5.0,4.0,5.0,5.0,6.0,Male,4971.177950614721,46196.857142857145, +2,2022.0,1,6077,45.11088614572414,45.427694906432336,40.39937863838843,43.063851136716764,47.68538171302404,49.35739350150585,50.576187677967084,51.80622927143314,42.88327924551372,48.0758891614074,54.500975471177185,56.20278309327103,12.896686761372539,12.848606895011788,5.846547888268455,9.23294077040725,16.528593895231104,19.971210750067556,5.072733256541056,5.0,4.0,5.0,5.0,6.0,Female,4904.068129579365,48442.42857142857, \ 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 45879ce12..e7b5397ef 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,giniEquivalisedHouseholdDisposableIncomeNational,giniMarketIncomeNational,grossLabourIncome_p20,grossLabourIncome_p40,grossLabourIncome_p60,grossLabourIncome_p80,medianEquivalisedHouseholdDisposableIncome,sIndex_p50,ydses_p20,ydses_p40,ydses_p60,ydses_p80, -1,2019.0,1,15875.360553295523,0.0,0.0,572.7015922586642,1248.2827754083432,1868.273470162789,2909.844748548787,15875.360553295523,NaN,4.578523387949914,7.22253235232603,7.93520982557409,8.432186186831146, -1,2020.0,1,15345.626380486061,0.0,0.0,447.4238448565247,1192.6373426203575,1860.3540603575398,2889.370230257769,15348.0373334674,NaN,4.398914087037572,7.161209610561701,7.89341460857302,8.405930909027763, -1,2021.0,1,14899.970203186678,0.0,0.0,376.2779789704161,1162.2266450696948,1866.428819133287,2917.847874188074,14899.781606682765,NaN,4.052457565118724,7.083216666966138,7.878626903561942,8.416332273087466, -1,2022.0,1,14628.405095840735,0.0,0.0,303.22825882928,1149.9971680201347,1820.7409706324966,2842.8374938266984,14628.405095840735,NaN,3.7441676118098814,6.989957497880787,7.851835576704947,8.389873866692882, -2,2019.0,1,15873.788716455236,0.0,0.0,572.2432767532691,1248.1061927255917,1868.190254860854,2909.689173751418,15873.788716455236,NaN,4.5786171507444475,7.224670734817771,7.934994015604467,8.431997978220402, -2,2020.0,1,15378.65888263112,0.0,0.0,466.2902247746595,1197.7308105516627,1860.408013859396,2891.115521394317,15385.580829982362,NaN,4.442727227295819,7.161349872148203,7.8925841056466295,8.404719912750444, -2,2021.0,1,14924.040877407799,0.0,0.0,378.35895165328515,1173.2290865569876,1866.6993583011586,2895.6541389680556,14924.040877407799,NaN,4.003236903163803,7.088364858294911,7.879321567558003,8.416691036219818, -2,2022.0,1,14572.14115492997,0.0,0.0,287.7984859683699,1137.295980301634,1808.503360326703,2836.00638736231,14572.14115492997,NaN,3.831492397598505,6.9993172777276875,7.8475019070905665,8.385970902195222, \ No newline at end of file +1,2019.0,1,15893.259495210466,0.0,0.0,569.1028186782703,1263.5545823907419,1894.8661580498665,2963.842868890779,15893.259495210466,NaN,4.539313367689359,7.224676340617442,7.9417118713601225,8.440191577551918, +1,2020.0,1,15450.675555923912,0.0,0.0,451.4651427977177,1233.8243829657201,1902.4523147997343,2951.7931085658242,15457.162100214107,NaN,4.524043578044857,7.219125953949933,7.903885558644447,8.415626934555487, +1,2021.0,1,15298.000257326397,0.0,0.0,424.9153776041294,1256.4261277559806,1955.4414441752015,3015.306898424873,15299.441504252674,NaN,4.4545006467058395,7.192291621671232,7.916589702250324,8.450821923786986, +1,2022.0,1,15232.74002620638,0.0,0.0,417.7967346445763,1270.9584599327354,1974.789399642244,3043.42042827119,15232.74002620638,NaN,4.289364738872164,7.202930234334758,7.920236785852028,8.441122163744154, +2,2019.0,1,15896.053581564363,0.0,0.0,568.5566818819747,1263.418687023759,1894.5038968267008,2963.831877035181,15895.807000631,NaN,4.532710774480414,7.224914075929009,7.942459399765602,8.440912764239624, +2,2020.0,1,15475.281619117763,0.0,0.0,454.52349928692735,1236.6542580567077,1917.0567046316553,2956.051621382719,15491.553419591526,NaN,4.526074972390295,7.221632951209526,7.900447737109357,8.414980924748122, +2,2021.0,1,15275.629797367497,0.0,0.0,417.3166876803331,1255.50513264458,1961.2300534024325,3016.60880121552,15275.629797367497,NaN,4.372693438601649,7.196167553576519,7.920812448401882,8.444158923750456, +2,2022.0,1,15270.483561244513,0.0,0.0,430.6307127714548,1275.2551319319703,1982.3250508806345,3072.155456062852,15269.458160983544,NaN,4.3177920068263695,7.195724330392581,7.920127679367916,8.444935553274666, \ 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 c9f90aa90..45418b3b7 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,aaconsToLeisRatio,aadisposableIncome18to29,aadisposableIncome30to54,aadisposableIncome55to74,aaexpenditure18to29,aaexpenditure18to54,aaexpenditure30to54,aaexpenditure55to74,aaworkNone18to29,aaworkNone18to74,aaworkNone30to54,aaworkNone55to74,avkids18to29,avkids30to54,avkids55to74,aworkFulltime18to29,aworkFulltime30to54,aworkFulltime55to74,aworkParttime18to29,aworkParttime30to54,aworkParttime55to74,dispIncomeGrossOfLosses18to29,dispIncomeGrossOfLosses30to54,dispIncomeGrossOfLosses55to74,health18to29,health30to54,health55to74,investmentIncome18to29,investmentIncome30to54,investmentIncome55to74,investmentLosses18to29,investmentLosses30to54,investmentLosses55to74,labourIncome18to29,labourIncome30to54,labourIncome55to74,pensionIncome18to29,pensionIncome30to54,pensionIncome55to74,population18to29,population30to54,population55to74,prDisabled18to29,prDisabled30to54,prDisabled55to74,prMarried18to29,prMarried30to54,prMarried55to74,wealth18to29,wealth30to54,wealth55to74, -1,2019.0,1,0.403300267160158,33.71382836251314,-398.8370733618408,-351.1079542798109,-720.2053324304946,-1107.8783294335205,-1342.9553883534224,-1403.8601881882912,-0.03416156852425184,-0.019158751359294623,-0.024628482008368202,0.07273615294117652,0.2511179910560716,0.9580040291337363,0.07952941176470588,0.5737874097007224,0.6438865643886564,0.23129411764705882,0.11764705882352941,0.17619711761971177,0.09482352941176471,1319.9260497910843,1700.6838453881592,1727.7376403630462,3.7413140694874443,3.458546412521308,3.1108235294117645,0.0,0.0,0.0,0.0,0.0,0.0,409.12552514711075,521.3014851971043,468.57963722480764,0.0,0.0,0.0,2907.0,6453.0,4250.0,0.02304781561747506,0.03781187044785371,0.05341176470588235,0.22359821121431028,0.6694560669456067,0.6148235294117647,0.0,0.0,0.0, -1,2020.0,1,4.894120444391318,23.10198001225922,-453.2190472970283,-453.68432654311505,-720.1695814395458,-1107.8550352405018,-1342.944837485266,-1403.8177540151999,-0.00487045421016008,-0.006078043196733274,-0.011562343859649132,0.06997309986181488,0.30654140570633265,1.0132348414896892,0.10041455550437586,0.523312456506611,0.62357648507233,0.22409028097650852,0.13883089770354906,0.18344105878731917,0.10479041916167664,1309.3142014408304,1646.3018714529717,1625.161268099742,3.583159359777314,3.388581101877501,3.1121602947950255,0.0,0.0,0.0,0.0,0.0,0.0,426.2964901430277,516.1703610963518,465.57348969208164,0.0,0.0,0.0,2874.0,6498.0,4342.0,0.018789144050104383,0.02754693751923669,0.051128512206356516,0.28357689631176064,0.7883964296706679,0.7759097190234915,0.0,0.0,0.0, -1,2021.0,1,-0.8152635931164193,-6.180984960965134,-471.5247029036195,-491.6502819589907,-720.1536973552134,-1107.895850409372,-1343.0209375334045,-1403.8033976396637,0.004559171727562983,0.007912896694579119,0.00799820907100407,0.07006488838900249,0.30046115643845334,0.9862370972786988,0.10679391047489208,0.4937921248669741,0.6015014075695965,0.2149511474664849,0.15892160340546294,0.18595558335939943,0.1138377641445126,1280.031236467606,1627.9962158463804,1587.1953126838664,3.389499822632139,3.2599311854863937,3.002044989775051,0.0,0.0,0.0,0.0,0.0,0.0,433.2546022663905,529.5644621631168,467.6922772937242,0.0,0.0,0.0,2819.0,6394.0,4401.0,0.021284143313231644,0.032843290584923364,0.06907521017950466,0.2600212841433132,0.8026274632467939,0.7916382640309021,0.0,0.0,0.0, -1,2022.0,1,4.726054649594156,-34.04259703366233,-508.8228003786621,-523.1531636155555,-720.1601642671012,-1107.8813266173609,-1342.993758592142,-1403.7485376550321,0.01307946547829153,0.01058240007311545,0.01304274863813229,0.0657467622086445,0.2957995058242146,0.9835019455252918,0.11360036207286717,0.4839392869749382,0.5853696498054475,0.2172437202987101,0.1602541475467702,0.19704280155642023,0.11586331749264539,1252.1696243949089,1590.6981183713378,1555.6924310273016,3.2488528062124957,3.1975097276264592,2.9264539488572074,0.0,0.0,0.0,0.0,0.0,0.0,425.90429284001715,521.0391886625475,477.90018506206616,0.0,0.0,0.0,2833.0,6425.0,4419.0,0.030003529827038473,0.03782101167315175,0.0864448970355284,0.24638192728556302,0.8144747081712063,0.8040280606472052,0.0,0.0,0.0, -2,2019.0,1,0.40497872478091845,32.98596199153212,-397.8354221076495,-353.77807675207396,-720.205280205579,-1107.8781782410917,-1342.9552827718626,-1403.8587161911869,-0.03405538630419824,-0.018950898472385402,-0.024346473380849082,0.07249101804511282,0.25120440467997246,0.9584753641152773,0.08012218045112782,0.5736407432897453,0.6431670281995662,0.231203007518797,0.11768754301445286,0.1766346451812829,0.09515977443609022,1319.1981834201033,1701.6854966423505,1725.0675178907832,3.740880935994494,3.460024790827394,3.112077067669173,0.0,0.0,0.0,0.0,0.0,0.0,408.8318384418148,521.7096331072603,467.11678163758256,0.0,0.0,0.0,2906.0,6454.0,4256.0,0.023055746730901584,0.038115897118066316,0.0531015037593985,0.2236751548520303,0.6684226836070654,0.6156015037593985,0.0,0.0,0.0, -2,2020.0,1,-0.26262105216675113,24.71467395450827,-456.46008220947306,-454.5529615619048,-720.1665665904206,-1107.859947192459,-1342.9537563848814,-1403.8222301596454,-0.005562349042145587,-0.006747063948466414,-0.01364837640501626,0.07052316042484419,0.3019853709508882,1.0219848273726584,0.10020780420226276,0.5235109717868338,0.62532899829695,0.22442853844377741,0.13932427725531174,0.18377457810806627,0.10390210113137843,1310.9268953830795,1643.060836540527,1624.2926330809523,3.5806339254615116,3.3876761108530733,3.107827291618564,0.0,0.0,0.0,0.0,0.0,0.0,425.7228831350267,514.5907502472991,464.4206870261194,0.0,0.0,0.0,2871.0,6459.0,4331.0,0.019157088122605363,0.02724880012385818,0.051720157007619484,0.2831765935214211,0.7906796717758167,0.779496652043408,0.0,0.0,0.0, -2,2021.0,1,0.5970613472251771,-2.343483867707846,-474.5227079162637,-504.3193914591236,-720.1496194125542,-1107.8971447875647,-1343.0256392753656,-1403.8076663758827,0.003508695454545463,0.007243033049103231,0.006747036096340309,0.07090659927173426,0.29651988636363635,0.9912417891773537,0.10559854346836596,0.49467329545454547,0.6044729433844229,0.21506599908966773,0.1590909090909091,0.1842352205192368,0.11288120163859809,1283.8687375608633,1624.9982108337363,1574.5262031837335,3.3735795454545454,3.262433531435721,2.9931725079654075,0.0,0.0,0.0,0.0,0.0,0.0,430.2871765085754,530.3871095166861,470.33698027728025,0.0,0.0,0.0,2816.0,6394.0,4394.0,0.02166193181818182,0.03159211761025962,0.06941283568502503,0.26029829545454547,0.8048170159524555,0.7899408284023669,0.0,0.0,0.0, -2,2022.0,1,1.05957685482171,-29.294978137885437,-526.24265437493,-536.1031622150447,-720.1611183015307,-1107.8832876920949,-1342.9966603582152,-1403.7502043431823,0.008490690328273931,0.009670894850631828,0.013069365890027967,0.066274614479638,0.2954465231203671,0.9900590245417832,0.11199095022624435,0.48746911401341336,0.5831003417210314,0.2171945701357466,0.16131309565831276,0.19928549238894067,0.11538461538461539,1256.9172432906857,1573.27826437507,1542.7424324278124,3.2492057889163433,3.206741223982603,2.9160633484162894,0.0,0.0,0.0,0.0,0.0,0.0,424.35122708105166,518.0878053404592,477.11131001812316,0.0,0.0,0.0,2833.0,6438.0,4420.0,0.030003529827038473,0.035414725069897485,0.08484162895927602,0.24567596187786797,0.8157812985399192,0.8038461538461539,0.0,0.0,0.0, \ No newline at end of file +1,2019.0,1,0.10618223861733411,5.497976005212195,-382.3881586937862,-301.798087031533,-720.1926339692178,-1107.8913546380732,-1342.9851903009285,-1403.8497360315512,-0.02108967309941523,-0.024302028361498917,-0.029742382519758248,0.055089094117647064,0.2511179910560716,0.9580040291337363,0.07952941176470588,0.5565875472996216,0.6466759646675965,0.25129411764705883,0.1217750257997936,0.17852161785216178,0.09247058823529412,1291.7101974337834,1717.1327600562138,1777.0475076113241,3.7413140694874443,3.458546412521308,3.1108235294117645,0.0,0.0,0.0,0.0,0.0,0.0,405.364411068083,525.7890841788899,484.96336138630573,0.0,0.0,0.0,2907.0,6453.0,4250.0,0.02304781561747506,0.03781187044785371,0.05341176470588235,0.22359821121431028,0.6694560669456067,0.6148235294117647,0.0,0.0,0.0, +1,2020.0,1,-0.05599716681804345,19.847577588727972,-459.63679764714766,-357.697638263362,-720.1377620955387,-1107.8375776313383,-1342.9373415374882,-1403.8075103753233,-9.241066132962272E-4,-0.008738701180930175,0.002924079668049806,0.03785794937759335,0.30281935259310827,1.0139849392961426,0.1016597510373444,0.5140967629655413,0.6191793453204242,0.2577224527431996,0.14410024364775495,0.17335177501152604,0.103273397879207,1306.0597990172992,1639.8841211028523,1721.147956379495,3.583710407239819,3.3851237129245426,3.1106500691562933,0.0,0.0,0.0,0.0,0.0,0.0,425.7752424878543,525.5611722847403,494.44099677771817,0.0,0.0,0.0,2873.0,6507.0,4338.0,0.018795683954054995,0.027201475334255418,0.05140617796219456,0.2857640097459102,0.7877670201321654,0.7812355924389119,0.0,0.0,0.0, +1,2021.0,1,-0.5840461647233698,38.461514200516376,-470.5013815788752,-368.3768116510573,-720.1443133923868,-1107.9202750348632,-1343.0650718768718,-1403.797060732632,-0.008328803940362117,-0.00293863880070544,0.02101910977443608,0.025130178488767863,0.2974795882144125,0.9783834586466166,0.11073292489221692,0.5101171458998935,0.6093358395989975,0.26843657817109146,0.1554845580404686,0.1651002506265664,0.10528704334014069,1324.6737356290876,1629.0195371711247,1710.4687829917998,3.3812566560170394,3.2579887218045114,3.0108917631041523,0.0,0.0,0.0,0.0,0.0,0.0,440.3482655846451,543.2785439101425,511.44170636262317,0.0,0.0,0.0,2817.0,6384.0,4407.0,0.021654242101526448,0.03320802005012531,0.06398910823689585,0.2602058927937522,0.8027882205513784,0.7937372362151123,0.0,0.0,0.0, +1,2022.0,1,0.30641143769667756,9.421988469237249,-488.14561613115234,-361.5405455757791,-720.171178215241,-1107.934950373567,-1343.0723050898366,-1403.751551478731,-0.009863912411847697,-0.005786327817570547,0.027253582078406974,0.009311020461747477,0.290197461212976,0.9771313005600498,0.11453146220009054,0.501410437235543,0.6079651524579963,0.2854232684472612,0.16572637517630465,0.16023646546359677,0.10411951109099139,1295.6342098978084,1611.3753026188476,1717.305049067078,3.2478843441466854,3.1981953951462354,2.9422815753734723,0.0,0.0,0.0,0.0,0.0,0.0,430.5686698753454,543.8188220976471,525.0889989073946,0.0,0.0,0.0,2836.0,6428.0,4418.0,0.031029619181946404,0.03764779091474798,0.07899502037120869,0.2492947813822285,0.8083385189794648,0.8096423721140787,0.0,0.0,0.0, +2,2019.0,1,0.10757809609904756,4.239871183058995,-380.8923636029467,-302.2456498239667,-720.1925767694933,-1107.8912434927847,-1342.9851451528928,-1403.8482646550067,-0.020634877013076425,-0.024091909048178595,-0.02930463885962195,0.05439891278195497,0.25120440467997246,0.9584753641152773,0.08012218045112782,0.5560908465244322,0.6461109389525875,0.25140977443609025,0.12181693048864418,0.1786488999070344,0.09304511278195489,1290.4520926116302,1718.6285551470532,1776.5999448188904,3.740880935994494,3.460024790827394,3.112077067669173,0.0,0.0,0.0,0.0,0.0,0.0,405.0980432406828,526.4604652428468,485.2159022814857,0.0,0.0,0.0,2906.0,6454.0,4256.0,0.023055746730901584,0.038115897118066316,0.0531015037593985,0.2236751548520303,0.6684226836070654,0.6156015037593985,0.0,0.0,0.0, +2,2020.0,1,0.5833386328972054,21.76866109818252,-456.98747419762503,-358.6785962370732,-720.1391907860017,-1107.8464114098674,-1342.9495362935122,-1403.8153314442336,-4.662304347826107E-4,-0.00836009065420562,0.002159973675266491,0.037998234222631155,0.2921739130434783,1.0169936659972192,0.10395584176632934,0.5109565217391304,0.6215047118801174,0.26057957681692734,0.14678260869565218,0.1717905144446161,0.10027598896044158,1307.9808825267537,1642.533444552375,1720.166998405784,3.5777391304347828,3.388228024100108,3.105105795768169,0.0,0.0,0.0,0.0,0.0,0.0,424.9818093499374,526.0564914673165,495.60736660968075,0.0,0.0,0.0,2875.0,6473.0,4348.0,0.01982608695652174,0.02672640197744477,0.051517939282428704,0.2813913043478261,0.7905144446160977,0.7838086476540939,0.0,0.0,0.0, +2,2021.0,1,-0.3731346312436665,42.019802139009926,-480.5360842752516,-369.4073583173015,-720.1525862335137,-1107.9228706295912,-1343.0649731608685,-1403.8052828720076,-0.0022864461265102998,-0.00212678064421451,0.021266685642946315,0.024222531563421912,0.28038379530916846,0.9959425717852685,0.10596777853415021,0.5085287846481876,0.6107990012484394,0.2711595189471296,0.15103056147832267,0.16338951310861424,0.10347174948944861,1328.232023567581,1618.9848344747484,1709.4382363255556,3.379175550817342,3.259207240948814,3.0006807351940097,0.0,0.0,0.0,0.0,0.0,0.0,443.8213183870071,541.8862130294164,511.5829911170676,0.0,0.0,0.0,2814.0,6408.0,4407.0,0.023454157782515993,0.031679151061173534,0.06648513728159745,0.2562189054726368,0.8082084893882646,0.7935103244837758,0.0,0.0,0.0, +2,2022.0,1,0.9787978383320135,2.713055680209436,-484.68418668573645,-369.86967784429817,-720.18597469679,-1107.9407350986398,-1343.0724251557492,-1403.7460386492721,-0.007864714678899098,-0.006883920942484967,0.025589198130258645,0.006919046941549656,0.2798165137614679,0.9904954814583983,0.11214318078840055,0.4947071277346507,0.6048613275163602,0.2920253738106026,0.17043048694424842,0.16500467435338112,0.09990937924784776,1288.9252771087806,1614.8367320642635,1708.975916798559,3.2519407198306283,3.1983483951386726,2.9340734028092434,0.0,0.0,0.0,0.0,0.0,0.0,424.8399122591644,545.3712450273727,528.419671659802,0.0,0.0,0.0,2834.0,6418.0,4414.0,0.03211009174311927,0.03755063882829542,0.07906660625283189,0.2399435426958363,0.809286382050483,0.8078840054372451,0.0,0.0,0.0, \ 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 be8427450..b9998f4c4 100644 --- a/src/test/java/simpaths/integrationtest/expected/Statistics31.csv +++ b/src/test/java/simpaths/integrationtest/expected/Statistics31.csv @@ -1,9 +1,9 @@ run,time,id_Statistics31,fertilityAdjustmentFactor,fertilityRateSimulated,fertilityRateTarget,partnershipAdjustmentFactor,shareCohabitingSimulated,shareCohabitingTarget,socialCareAdjustmentFactor,utilityAdjustmentFactorCouples,utilityAdjustmentFactorSfemales,utilityAdjustmentFactorSmales, 1,2019.0,1,-0.279462622342386,0.06017023774581744,0.06092462518117112,-0.613869665517935,0.534154168576855,0.639752445827121,0.0,0.0,0.0,0.0, -1,2020.0,1,-0.2659197918000082,0.07346109175377467,0.059320659210062375,-0.5988444469664678,0.6576756791637091,0.6494882472052341,0.0,0.0,0.0,0.0, -1,2021.0,1,-0.25543875103684177,0.05653710247349823,0.0570746110314559,-0.5821259283872153,0.6638966435110043,0.6444373367775469,0.0,0.0,0.0,0.0, -1,2022.0,1,-0.24930347300809638,0.05865188211263496,0.05798520015481514,-0.584760268520426,0.6684237593211623,0.6442540414107724,0.0,0.0,0.0,0.0, +1,2020.0,1,-0.2659197918000082,0.07343976777939042,0.059320659210062375,-0.5988444469664678,0.6601741373750403,0.6494882472052341,0.0,0.0,0.0,0.0, +1,2021.0,1,-0.25543875103684177,0.05658709106984969,0.0570746110314559,-0.5821259283872153,0.6646749366759759,0.6444373367775469,0.0,0.0,0.0,0.0, +1,2022.0,1,-0.24930347300809638,0.05772594752186589,0.05798520015481514,-0.584760268520426,0.6685082872928176,0.6442540414107724,0.0,0.0,0.0,0.0, 2,2019.0,1,-0.279462622342386,0.06018790369935408,0.06092462518117112,-0.613869665517935,0.5337174283095456,0.639752445827121,0.0,0.0,0.0,0.0, -2,2020.0,1,-0.2659197918000082,0.07423580786026202,0.059320659210062375,-0.5988444469664678,0.6587214197810739,0.6494882472052341,0.0,0.0,0.0,0.0, -2,2021.0,1,-0.25543875103684177,0.0575390970787843,0.0570746110314559,-0.5821259283872153,0.6635920753491393,0.6444373367775469,0.0,0.0,0.0,0.0, -2,2022.0,1,-0.24930347300809638,0.05890930300379119,0.05798520015481514,-0.584760268520426,0.6672227926078029,0.6442540414107724,0.0,0.0,0.0,0.0, \ No newline at end of file +2,2020.0,1,-0.2659197918000082,0.07423580786026202,0.059320659210062375,-0.5988444469664678,0.6601176242486912,0.6494882472052341,0.0,0.0,0.0,0.0, +2,2021.0,1,-0.25543875103684177,0.05648720211827008,0.0570746110314559,-0.5821259283872153,0.6654130462974971,0.6444373367775469,0.0,0.0,0.0,0.0, +2,2022.0,1,-0.24930347300809638,0.057759626604434074,0.05798520015481514,-0.584760268520426,0.6637504020585397,0.6442540414107724,0.0,0.0,0.0,0.0, \ No newline at end of file