diff --git a/src/main/java/simpaths/experiment/SimPathsCollector.java b/src/main/java/simpaths/experiment/SimPathsCollector.java index 52467b3d1..606847c58 100644 --- a/src/main/java/simpaths/experiment/SimPathsCollector.java +++ b/src/main/java/simpaths/experiment/SimPathsCollector.java @@ -448,6 +448,11 @@ public void update() { stats.setYHhQuintilesC5P60(p60HouseholdsGrossIncome); stats.setYHhQuintilesC5P80(p80HouseholdsGrossIncome); + if (model.getYear() > model.getStartYear()) { + for (BenefitUnit benefitUnit : model.getBenefitUnits()) { + benefitUnit.updateIncomeQuintile(); + } + } } diff --git a/src/main/java/simpaths/model/BenefitUnit.java b/src/main/java/simpaths/model/BenefitUnit.java index 99feab649..0cdc4ae42 100644 --- a/src/main/java/simpaths/model/BenefitUnit.java +++ b/src/main/java/simpaths/model/BenefitUnit.java @@ -1881,20 +1881,7 @@ protected void calculateBUIncome() { double tmpHHYpnbihs_dv = (ypnbihsMaleMonthly + ypnbihsFemaleMonthly) / equivalisedWeight; //Equivalised setI_yNonBenHhGrossAsinh(asinh(tmpHHYpnbihs_dv)); //Asinh transformation of HH non-benefit income - //Based on the percentiles calculated by the collector, assign household to one of the quintiles of (equivalised) income distribution - if(collector.getStats() != null) { //Collector only gets initialised when simulation starts running - if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P20()) { - yHhQuintilesMonthC5 = Ydses_c5.Q1; - } else if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P40()) { - yHhQuintilesMonthC5 = Ydses_c5.Q2; - } else if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P60()) { - yHhQuintilesMonthC5 = Ydses_c5.Q3; - } else if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P80()) { - yHhQuintilesMonthC5 = Ydses_c5.Q4; - } else { - yHhQuintilesMonthC5 = Ydses_c5.Q5; - } - } + updateIncomeQuintile(); } else if(getOccupancy().equals(Occupancy.Single_Male)) { if (male != null) { @@ -1909,19 +1896,7 @@ protected void calculateBUIncome() { double tmpHHYpnbihs_dv = ypnbihsMaleMonthly / equivalisedWeight; //Equivalised setI_yNonBenHhGrossAsinh(asinh(tmpHHYpnbihs_dv)); //Asinh transformation of HH non-benefit income - if(collector.getStats() != null) { //Collector only gets initialised when simulation starts running - if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P20()) { - yHhQuintilesMonthC5 = Ydses_c5.Q1; - } else if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P40()) { - yHhQuintilesMonthC5 = Ydses_c5.Q2; - } else if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P60()) { - yHhQuintilesMonthC5 = Ydses_c5.Q3; - } else if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P80()) { - yHhQuintilesMonthC5 = Ydses_c5.Q4; - } else { - yHhQuintilesMonthC5 = Ydses_c5.Q5; - } - } + updateIncomeQuintile(); } else throw new RuntimeException("single male unit does not include a single male"); } else { @@ -1939,25 +1914,28 @@ protected void calculateBUIncome() { double tmpHHYpnbihs_dv = ypnbihsFemaleMonthly / equivalisedWeight; //Equivalised setI_yNonBenHhGrossAsinh(asinh(tmpHHYpnbihs_dv)); //Asinh transformation of HH non-benefit income - if(collector.getStats() != null) { //Collector only gets initialised when simulation starts running - - if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P20()) { - yHhQuintilesMonthC5 = Ydses_c5.Q1; - } else if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P40()) { - yHhQuintilesMonthC5 = Ydses_c5.Q2; - } else if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P60()) { - yHhQuintilesMonthC5 = Ydses_c5.Q3; - } else if(getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P80()) { - yHhQuintilesMonthC5 = Ydses_c5.Q4; - } else { - yHhQuintilesMonthC5 = Ydses_c5.Q5; - } - } + updateIncomeQuintile(); } else throw new RuntimeException("single female unit does not include a single male"); } } + public void updateIncomeQuintile() { + if (collector.getStats() != null) { + if (getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P20()) { + yHhQuintilesMonthC5 = Ydses_c5.Q1; + } else if (getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P40()) { + yHhQuintilesMonthC5 = Ydses_c5.Q2; + } else if (getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P60()) { + yHhQuintilesMonthC5 = Ydses_c5.Q3; + } else if (getI_yNonBenHhGrossAsinh() <= collector.getStats().getYHhQuintilesC5P80()) { + yHhQuintilesMonthC5 = Ydses_c5.Q4; + } else { + yHhQuintilesMonthC5 = Ydses_c5.Q5; + } + } + } + public int getSize() { return members.size(); } diff --git a/src/test/java/simpaths/integrationtest/expected/AlignmentAdjustmentFactors1.csv b/src/test/java/simpaths/integrationtest/expected/AlignmentAdjustmentFactors1.csv index 843c7c7b1..729030772 100644 --- a/src/test/java/simpaths/integrationtest/expected/AlignmentAdjustmentFactors1.csv +++ b/src/test/java/simpaths/integrationtest/expected/AlignmentAdjustmentFactors1.csv @@ -1,9 +1,9 @@ run,time,id_AlignmentAdjustmentFactors1,empShareSimACFemales,empShareSimACMales,empShareSimCouples,empShareSimSingleDepFemales,empShareSimSingleDepMales,empShareSimSingleFemales,empShareSimSingleMales,empShareTgtACFemales,empShareTgtACMales,empShareTgtCouples,empShareTgtSingleDepFemales,empShareTgtSingleDepMales,empShareTgtSingleFemales,empShareTgtSingleMales,fertilityAdjFactor,fertilityRateSim,fertilityRateTgt,inSchoolAdjFactor,inSchoolShareSim,inSchoolShareTgt,partnershipAdjFactor,shareCohabitingSim,shareCohabitingTgt,utilityAdjACFemales,utilityAdjACMales,utilityAdjCouples,utilityAdjSingleDepFemales,utilityAdjSingleDepMales,utilityAdjSingleFemales,utilityAdjSingleMales 1,2019.0,1,0.5623931623931624,0.5619047619047619,0.8590878148400273,0.3333333333333333,0.44308943089430897,0.43822697265011,0.5445244410761653,0.5403293808853606,0.5311791259117856,0.8735970003111929,0.3943366638089926,0.465356415881109,0.4438849669010334,0.4705375056413739,0.0,0.05029585798816568,0.05113363440615968,0.0,0.281711358843025,0.3023858368396759,0.0,0.5387792565396972,0.632472038269043,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -1,2020.0,1,0.4490644490644491,0.5430711610486891,0.9006183745583038,0.4628975265017668,0.4928571428571429,0.3298311444652908,0.42654700047236654,0.5501985392408713,0.5109522836960044,0.8754389771797882,0.3941959194429085,0.4620365639995361,0.4428142056392469,0.4648045911203806,0.0,0.04911932522947159,0.04996578478889472,0.0,0.2927051671732523,0.2760101854801178,1.5821116748810904,0.6229102972744422,0.6234807968139648,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -1,2021.0,1,0.4869215291750503,0.5420393559928444,0.9226486961617345,0.48757763975155277,0.5,0.39576923076923076,0.46745562130177515,0.5382718801505548,0.5130523068280014,0.8776418122289941,0.3980978816455363,0.4641592336214714,0.4451259300414946,0.4776386065456221,0.0,0.05611866501854141,0.04833442666835588,0.0,0.3145210494203783,0.2792655229568481,0.6147268869900452,0.632198783486476,0.6310330629348755,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -1,2022.0,1,0.48047538200339557,0.5847328244274809,0.9290843806104129,0.49682539682539684,0.4911111111111111,0.4236343366778149,0.4947916666666667,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.4530541291186285,0.5097880138188646,0.0,0.04872619342072718,0.04938041570024613,0.0,0.3029197080291971,0.2648949027061462,0.0,0.6109502670012225,0.6104874014854431,0.0,0.0,0.0,0.0,0.0,0.0,0.0 +1,2020.0,1,0.43844492440604754,0.5152129817444219,0.8983026046239392,0.4653284671532847,0.494949494949495,0.3187919463087248,0.4172461752433936,0.5501985392408713,0.5109522836960044,0.8754389771797882,0.3941959194429085,0.4620365639995361,0.4428142056392469,0.4648045911203806,0.0,0.050434782608695654,0.04996578478889472,0.0,0.3000608642726719,0.2760101854801178,1.5626426082300122,0.6226476525363026,0.6234807968139648,0.0,0.0,0.0,0.0,0.0,0.0,0.0 +1,2021.0,1,0.4613821138211382,0.5103578154425612,0.9184925503943909,0.4891304347826087,0.5,0.3802163833075734,0.4492964580300825,0.5382718801505548,0.5130523068280014,0.8776418122289941,0.3980978816455363,0.4641592336214714,0.4451259300414946,0.4776386065456221,0.0,0.05242236024844721,0.04833442666835588,0.0,0.3339455157636976,0.2792655229568481,0.7185893929818753,0.632404406999352,0.6310330629348755,0.0,0.0,0.0,0.0,0.0,0.0,0.0 +1,2022.0,1,0.4754653130287648,0.5619047619047619,0.9280842230130486,0.4968152866242038,0.49159663865546216,0.41312453392990306,0.4763244256915143,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.4530541291186285,0.5097880138188646,0.0,0.04865398863917016,0.04938041570024613,0.0,0.3119127008184298,0.2648949027061462,0.0,0.6123811970202928,0.6104874014854431,0.0,0.0,0.0,0.0,0.0,0.0,0.0 2,2019.0,1,0.5623931623931624,0.5625990491283677,0.8589656345695815,0.3341584158415842,0.4426229508196721,0.44052863436123346,0.5452823039029936,0.5403293808853606,0.5311791259117856,0.8735970003111929,0.3943366638089926,0.465356415881109,0.4438849669010334,0.4705375056413739,0.0,0.05025868440502587,0.05113363440615968,0.0,0.28154170430593195,0.3023858368396759,0.0,0.5392124746118063,0.632472038269043,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -2,2020.0,1,0.4968421052631579,0.516728624535316,0.8991959499702203,0.46539792387543255,0.49336283185840707,0.32237579379902875,0.42258823529411765,0.5501985392408713,0.5109522836960044,0.8754389771797882,0.3941959194429085,0.4620365639995361,0.4428142056392469,0.4648045911203806,0.0,0.05358471843215083,0.04996578478889472,0.0,0.29526123936816523,0.2760101854801178,1.612974117630252,0.6220344491387715,0.6234807968139648,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -2,2021.0,1,0.522633744855967,0.5338208409506399,0.9170299331589654,0.4921875,0.4981060606060606,0.3822746291365538,0.4681575109382596,0.5382718801505548,0.5130523068280014,0.8776418122289941,0.3980978816455363,0.4641592336214714,0.4451259300414946,0.4776386065456221,0.0,0.06938675787930614,0.04833442666835588,0.0,0.30186972255729794,0.2792655229568481,0.6958228869629879,0.6325258626228876,0.6310330629348755,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -2,2022.0,1,0.4956369982547993,0.5676923076923077,0.928942542787286,0.4937888198757764,0.4944029850746269,0.4195906432748538,0.4913752913752914,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.4530541291186285,0.5097880138188646,0.0,0.048714144411473786,0.04938041570024613,0.0,0.3117001828153565,0.2648949027061462,0.0,0.6076616531687877,0.6104874014854431,0.0,0.0,0.0,0.0,0.0,0.0,0.0 \ No newline at end of file +2,2020.0,1,0.488272921108742,0.49510763209393344,0.8968371268105232,0.4642857142857143,0.48863636363636365,0.31084606783451363,0.4122315592903828,0.5501985392408713,0.5109522836960044,0.8754389771797882,0.3941959194429085,0.4620365639995361,0.4428142056392469,0.4648045911203806,0.0,0.05477075588599752,0.04996578478889472,0.0,0.29936305732484075,0.2760101854801178,1.597215988964044,0.6226844328891777,0.6234807968139648,0.0,0.0,0.0,0.0,0.0,0.0,0.0 +2,2021.0,1,0.5112936344969199,0.515828677839851,0.9155542658154382,0.48833333333333334,0.5,0.37012987012987014,0.4497328800388538,0.5382718801505548,0.5130523068280014,0.8776418122289941,0.3980978816455363,0.4641592336214714,0.4451259300414946,0.4776386065456221,0.0,0.05953557312252965,0.04833442666835588,0.0,0.3200365408038977,0.2792655229568481,0.7195704173500472,0.6317897048375638,0.6310330629348755,0.0,0.0,0.0,0.0,0.0,0.0,0.0 +2,2022.0,1,0.4878472222222222,0.5517241379310345,0.9268476621417798,0.49508196721311476,0.49607843137254903,0.4112252384446075,0.48206071757129715,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.4530541291186285,0.5097880138188646,0.0,0.048617966436327736,0.04938041570024613,0.0,0.3205712549377089,0.2648949027061462,0.0,0.6078255291853752,0.6104874014854431,0.0,0.0,0.0,0.0,0.0,0.0,0.0 \ No newline at end of file diff --git a/src/test/java/simpaths/integrationtest/expected/EmploymentStatistics1.csv b/src/test/java/simpaths/integrationtest/expected/EmploymentStatistics1.csv index 1b3b93c4d..87b0dd7f9 100644 --- a/src/test/java/simpaths/integrationtest/expected/EmploymentStatistics1.csv +++ b/src/test/java/simpaths/integrationtest/expected/EmploymentStatistics1.csv @@ -1,9 +1,9 @@ run,time,id_EmploymentStatistics1,labEmpShare,labEmpToNotEmpShare,labNotEmpToEmpShare,labUnempShare 1,2019.0,1,0.712445288628293,0.0,0.0,0.15533900404657694 -1,2020.0,1,0.7179465983301645,0.07705459933888066,0.40707497360084477,0.1521864925188063 -1,2021.0,1,0.7550785426433095,0.017280071813285457,0.3768038482095136,0.10518957151081504 -1,2022.0,1,0.7656365275842282,0.02423469387755102,0.29309035687167806,0.0988605623411755 +1,2020.0,1,0.7127131269657342,0.08610857664233576,0.39660657476139977,0.15800364178116205 +1,2021.0,1,0.7461665292662819,0.020821545773452528,0.36030927835051546,0.11286067600989283 +1,2022.0,1,0.7609229258713794,0.023967472715600256,0.28347578347578345,0.10423825887743414 2,2019.0,1,0.7128238983330583,0.0,0.0,0.15514111239478462 -2,2020.0,1,0.7114559260482007,0.08077709611451943,0.38862307283359915,0.15673489600528226 -2,2021.0,1,0.7493476842791911,0.01766824217870808,0.3622967479674797,0.11358447488584475 -2,2022.0,1,0.757982642868839,0.025698682942499197,0.2967651195499297,0.10283281480268544 \ No newline at end of file +2,2020.0,1,0.7056395012798282,0.08969986357435197,0.37845010615711255,0.16373544711419372 +2,2021.0,1,0.7423297785069729,0.021044249800932772,0.3522446965959546,0.12026251025430681 +2,2022.0,1,0.7542068289495181,0.024916765116528836,0.2840079628400796,0.10790720470511354 \ No newline at end of file diff --git a/src/test/java/simpaths/integrationtest/expected/HealthStatistics1.csv b/src/test/java/simpaths/integrationtest/expected/HealthStatistics1.csv index 0d486c234..64673b159 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,demLifeSatScore0to10Avg,demLifeSatScore0to10P10,de 1,2019.0,1,6.798653101737303,3.33,5.0,8.0,8.33,8.33,Total,8313.63015908381,68496.43000000333,47.53391960297742,33.416,42.19,49.52,54.79,57.73,10075,51.020747394541296,36.17,47.59,54.51,57.49,59.64,11.50302729528536,6.0,8.0,10.0,13.0,19.0 1,2019.0,1,6.82559311740912,3.33,5.0,8.0,8.33,8.33,Male,4178.113558218262,33718.430000001055,48.500955465587225,35.652,43.66,50.86,55.197500000000005,58.15,4940,51.79769838056671,39.08,49.0,54.77,57.49,59.31,10.857489878542511,6.0,8.0,10.0,12.0,17.0 1,2019.0,1,6.77273612463507,3.33,5.0,8.0,8.33,8.33,Female,4135.516600865757,34778.000000001084,46.60360662122688,31.608,40.8,48.87,54.2,57.33,5135,50.27330087633859,34.18,45.74,54.03,57.49,59.89,12.124050632911393,6.0,8.0,11.0,14.0,21.0 -1,2020.0,1,6.6145358041802025,3.7666336552029334,5.222159166466565,6.730759901862367,8.16637791131063,9.45956341274334,Total,8122.408872271123,66667.90637033226,45.9036620843742,32.76041987699348,39.42547467103069,46.32998491503522,52.888089341889014,58.779144471354584,10079,51.31536563011669,37.478675114637504,45.4553496715998,52.34846463570141,58.468540748836105,63.46259609758929,12.66146844857907,5.742978242682843,8.794527073422076,12.317437126483158,16.18488573396826,20.002347795486234 -1,2020.0,1,6.626325011114707,3.805744796504718,5.292521016604588,6.7436549444174805,8.140813216794122,9.448738725825232,Male,4089.7518389310344,32753.924529939995,47.16004134094487,34.72060242044466,40.92513830937019,47.45773118565858,53.81664007943717,59.635697316209274,4943,51.99935691965081,39.0965689792193,46.155821046703046,52.75851350330392,58.80571549778201,63.8502526991901,11.932659642546787,5.297281267527709,8.216250042609923,11.647003163264127,15.335487311411011,18.97702901756019 -1,2020.0,1,6.603189610668323,3.7461330212911594,5.148107115427289,6.7153196174055685,8.192784063571331,9.471154701795063,Female,4032.657033340079,33913.98184039251,44.69449489877612,31.334291564943996,38.157549899920284,45.15466063075943,51.82796605067129,57.61215428517951,5136,50.65707728428983,35.87646489659886,44.56246883163646,51.917407081210044,58.11668037935321,63.08832636686682,13.362890163574518,6.19336925077437,9.441079561386836,12.977554167910503,16.89382985102585,20.978926770896074 -1,2021.0,1,6.6116217230235605,3.8614021685837057,5.2190104170109555,6.709742678474911,8.142357919444407,9.417434441271515,Total,8156.842830507635,66995.56291939774,45.69465619445754,32.44658131379948,38.87866646227373,45.90039626764637,52.75951280949984,58.75427004742366,10133,51.55215502294252,37.93585318360506,44.95517172097567,52.10947487040213,58.8145528351254,64.43889224535938,12.86988656758509,5.794482940969529,9.030566466275577,12.727668267938837,16.530785371056393,19.985299541232735 -1,2021.0,1,6.653869468025526,3.910198566584724,5.2657061865457315,6.737369333307095,8.209256929825525,9.46127327836772,Male,4079.102036526693,32949.96160566241,46.97038726289406,34.12550007799661,40.285012982217054,47.098200806472185,53.825617803520544,59.7658888119366,4952,52.045184494797745,39.16077811879323,45.64896453666515,52.467442690378284,58.85703110614846,64.50891826205311,12.294333505794658,5.2400452235076465,8.608846053600171,12.143461763297328,15.88036307449202,19.474700384182754 -1,2021.0,1,6.571241326719796,3.784611532333538,5.173004493055746,6.68403775670342,8.08733237952504,9.368249431685976,Female,4077.7407939809214,34045.601313735264,44.475312389999026,31.073933089580763,37.25982990604585,44.60862716316909,51.71803670125011,57.729384603863416,5181,51.08091743471102,36.741850155073166,44.198299335453214,51.74979586767439,58.76292523630612,64.3875040426933,13.420000206262175,6.395423498925913,9.507756347078354,13.291969357461088,17.129981397680545,20.424006333716136 -1,2022.0,1,6.463087631795269,3.6115117513755575,5.083610990846666,6.5375872737751175,8.00888855569484,9.339029015970821,Total,8067.2488429068035,65671.43342667173,45.47814193849493,32.259210315350686,38.65682202937164,45.49138907443207,52.493213972640326,58.584904232173976,10161,50.928213480019515,37.060325956171035,44.0913836095843,51.28251535389666,58.21344896220131,64.312796536259,12.83094625627811,5.827257937463892,9.069215452609367,12.748839015971619,16.416684654744316,19.91190747846177 -1,2022.0,1,6.49592219400106,3.638438444458341,5.103673704359543,6.5624658520953645,8.039986177707839,9.359071255047416,Male,4039.5098616001965,32271.741459797264,46.64156864107997,33.442664210092154,39.75495656119613,46.61571161556387,53.47393202990958,59.76600300848471,4968,51.567465260183354,38.054824328045505,44.850707075767154,51.80767255012893,58.588190256260994,64.71146326585722,12.303302700643297,5.439279805733378,8.620323190538283,12.25657515013474,15.819364095105875,19.38696258032791 -1,2022.0,1,6.431675710932919,3.6005707100813686,5.0633535899745254,6.511375110971347,7.966933535230682,9.322339782002775,Female,4027.738981306549,33399.69196687465,44.365123671897045,30.884898737418645,37.592401707807994,44.44247206684387,51.31240036719869,57.32812572811659,5193,50.31665891736718,36.124063770331276,43.41782802106208,50.71085588417685,57.83824693213941,64.03882115739897,13.335728306036255,6.270924261379005,9.584102844951865,13.280949637616258,16.90759053230871,20.466737056706304 +1,2020.0,1,6.462951528025188,3.614708997016763,5.064478055964648,6.565245719253205,7.993081293247533,9.275293140364779,Total,8018.056282977553,65036.681226517474,45.59816866176295,32.498020687144695,39.12941640682706,46.02520512322878,52.552625667963795,58.40511370943733,10063,50.75011067958994,36.94682224629633,44.87070829136867,51.754234230355245,57.8608748233535,62.78569232181659,12.876217535551536,5.981422027467062,9.016216690912387,12.539113762339044,16.381168602592343,20.233666689944663 +1,2020.0,1,6.470881229098957,3.635371480639752,5.1216735671768685,6.57809989170293,7.965614397824739,9.26700768048869,Male,4041.06251465974,31946.74062806155,46.84416894130096,34.557412423100345,40.682844000046444,47.123053518873824,53.432252636945336,59.230077087037486,4937,51.43704173325943,38.5989605306334,45.611024768481485,52.184369788159096,58.2550504152584,63.25566024701793,12.135726016657534,5.534595327363625,8.44183849878637,11.866387577054669,15.524694081562522,19.160844376831065 +1,2020.0,1,6.455314201805698,3.6095738043439076,5.011785253397298,6.5547198145180285,8.034482160803217,9.288501508736857,Female,3976.993768317773,33089.94059845601,44.39810947719775,31.08913736769434,37.81542822011793,44.89599515309341,51.50578786865815,57.326447446556934,5126,50.08850736082914,35.499770407712134,44.09309204308879,51.34023144893138,57.49249295357595,62.45909625771788,13.589406499417928,6.5153696480606715,9.674221813236773,13.227562839376127,17.105992386900382,21.159058469398673 +1,2021.0,1,6.428246772232336,3.6563653914100795,4.992946253418178,6.514602838632262,7.955147178240108,9.24159962790211,Total,7989.551472244042,64983.146620496686,45.194338814853396,31.884234828174854,38.35389597618307,45.38444508441366,52.20174160522576,58.3521815596807,10109,50.73826847159339,37.1745188858476,44.099224368804926,51.294435352155006,57.92486689370581,63.700764582971296,13.149894713368127,6.08039064106175,9.283131792158205,13.048854193998913,16.847787333675107,20.296497492066468 +1,2021.0,1,6.474368923605774,3.720355645519885,5.027076958201254,6.545657287951086,8.043279058115509,9.278918238455871,Male,4008.772947413894,32028.703065077767,46.46545945011156,33.57616670011204,39.79731628353439,46.60647687067156,53.29351443065777,59.27516122457845,4947,51.27715604734291,38.309715454269714,44.89344100367095,51.678874248939835,58.09733631788212,63.78535344706458,12.549720843925082,5.475610990703916,8.817466740183878,12.393564856976612,16.165947599869448,19.714015054341623 +1,2021.0,1,6.384045632587915,3.5917664810232033,4.963399668408754,6.487515913530325,7.885547837218087,9.210303731864315,Female,3980.778524830072,32954.44355541882,43.9761610189169,30.52676369791317,36.753460628277026,44.13418995903494,51.1731000651394,57.36638126476407,5162,50.22182584523989,35.90425999659227,43.302279253088976,50.88018779103369,57.78535647559769,63.55393449985461,13.725071027226052,6.687218384539204,9.776053777460417,13.607826445505516,17.470828469620646,20.799332795139414 +1,2022.0,1,6.349281738665502,3.4835314373912736,4.954228624881269,6.4007964835307,7.878554259672826,9.25967720566508,Total,7936.75488347602,64616.64025439881,44.96893619944563,31.702298294202826,38.06818983129972,44.99201943608207,51.999114667158324,58.14800168939281,10177,50.19370694160524,36.16764655353028,43.377080483232795,50.594697664045086,57.46118576502481,63.69024443605748,13.066156038759418,6.024976751132535,9.286088360763038,12.94681781356934,16.659890689427577,20.241472388050553 +1,2022.0,1,6.383939178959008,3.5005399633642766,4.985571996134585,6.44220522644166,7.932066346306498,9.289221698205122,Male,3980.099720306656,31766.481354500025,46.111727634386455,32.86899817263326,39.17507234918051,46.108093056413736,52.938521841102606,59.26107502835745,4976,50.88218598561647,37.245212860289406,44.220776742867955,51.11845318302869,57.899875424167085,64.14332337700034,12.51150061892207,5.68471066181315,8.82468462920449,12.405410753699904,16.042681036447398,19.727677684091837 +1,2022.0,1,6.316123610824581,3.4574369430424947,4.9305991842954935,6.3759326041465885,7.840024983649969,9.237084711394981,Female,3956.655163169356,32850.15889989865,43.87558296347848,30.452774136939315,37.04768270725405,44.02500915384995,50.87190611411545,56.91994923890401,5201,49.53501212849231,35.027534548916165,42.66611403359006,50.04487339175777,57.05438561088774,63.24937332153303,13.596816559642063,6.4703792502035995,9.79621715417642,13.546398285386827,17.185227680669165,20.764655134778486 2,2019.0,1,6.799095596985654,3.33,5.0,8.0,8.33,8.33,Total,8323.349559890836,68562.08000000333,47.54007040856779,33.425,42.19,49.52,54.79,57.73,10084,51.027703292344626,36.18,47.605000000000004,54.51,57.49,59.64,11.495934153113843,6.0,8.0,10.0,13.0,19.0 2,2019.0,1,6.828700485044678,3.33,5.0,8.0,8.33,8.33,Male,4185.2461878088,33788.410000001066,48.517956750202266,35.67,43.66,50.864999999999995,55.197500000000005,58.15,4948,51.791240905416245,39.079,49.0,54.77,57.49,59.31,10.851657235246565,6.0,8.0,10.0,12.0,17.0 2,2019.0,1,6.770574376947251,3.33,5.0,8.0,8.33,8.33,Female,4138.103372082248,34773.67000000108,46.59797897196263,31.616000000000003,40.7925,48.835,54.2,57.33,5136,50.29211448598103,34.271,45.74,54.03,57.49,59.89,12.116627725856699,6.0,8.0,11.0,14.0,21.0 -2,2020.0,1,6.648530322680276,3.798533559017458,5.246134187086383,6.765453938693191,8.214569954104112,9.49823605832067,Total,8160.4061836057535,67116.91360745739,45.991701701356305,32.821783768474845,39.46337166342815,46.35006053636001,53.02093548662156,58.835433726929615,10095,51.43349873065682,37.64004187077226,45.519442039907084,52.44430441596412,58.54493146361481,63.58032620081715,12.892174155904131,5.941239718920905,9.038052603027833,12.5620019419938,16.389742385253584,20.209999590600944 -2,2020.0,1,6.701790056047846,3.8879612847729885,5.348863402779376,6.817344664927628,8.229292733365684,9.52210708506867,Male,4098.052433782941,33214.071517773125,47.22725312217155,34.73279764915407,41.05400091483066,47.54452840037397,53.86249506436657,59.6908719208839,4956,51.91222279039014,38.991161795543036,46.05860571906381,52.68552387774127,58.71408535918422,63.78253241142672,12.097710182919613,5.465500783867313,8.409656342447645,11.84821669424816,15.415124248299,19.13567886379256 -2,2020.0,1,6.59716717059433,3.752745435962728,5.154152833450976,6.70958205757793,8.192529032539117,9.475260339214275,Female,4062.3537498227943,33902.842089684265,44.80014831712622,31.299839260810792,38.281225119575815,45.25936507693766,51.93654439169077,57.74689782848656,5139,50.9718220542527,36.21785989238145,44.927755197291994,52.18264236825294,58.36347553214964,63.3381980500193,13.658347234345719,6.517946352244499,9.782443927008583,13.29594414577838,17.16487199584773,21.22896603027014 -2,2021.0,1,6.632988932177234,3.89042975364794,5.2168694951768835,6.725526186477747,8.17114101291336,9.446917164421222,Total,8251.653005727949,67848.84378724093,45.81521403252323,32.47785202716254,38.94257755068535,46.04605670914601,52.844660328438096,58.93017494557345,10229,51.61515682075839,37.87868531602598,45.03227657266416,52.12926594152025,58.87595326385718,64.5681536208771,13.084520615295768,6.056126683762062,9.25484488122984,12.935210411140464,16.72719241174349,20.245222259639945 -2,2021.0,1,6.740391016673601,4.01408417845748,5.334938552318707,6.819337025420037,8.295005355096148,9.550035538144545,Male,4112.3207730093845,33728.9166474347,47.02977618699129,34.07768944610342,40.36773142925023,47.294297180603614,53.822385933388,59.94396092250889,5004,51.871636157995724,38.87620744376085,45.416369793418966,52.32782633609346,58.77947628263789,64.47585087266481,12.284873362283882,5.202210563422172,8.655643718402136,12.096589674513634,15.84090403573634,19.466693289177073 -2,2021.0,1,6.5301295961351435,3.758263396755218,5.119676988518804,6.6381640282726275,8.04559585420636,9.329085893221038,Female,4139.33223271858,34119.927139806125,44.652023789277656,31.2267526208055,37.48200408596245,44.79291890224695,51.86390096590401,57.82483258139481,5225,51.36952570046461,37.038904170342526,44.549351244026894,52.02029826896653,58.997197614473535,64.61185618406273,13.850345467749571,6.920412214061548,9.974223667687149,13.718488268006896,17.560584392997008,20.887596316563414 -2,2022.0,1,6.490606203423842,3.6368042798057245,5.100949722496486,6.5637002838067335,8.019212467044648,9.396024895962734,Total,8096.933779649765,66087.35236326155,45.55303213660928,32.16063896928925,38.65840551441148,45.58713349851223,52.551681789143444,58.81803950246082,10182,51.041370914664604,37.1880182744552,44.19368199034828,51.308862918565595,58.33962038471232,64.53092037203739,13.000160458230006,5.908618607635587,9.247696743971947,12.896862364902699,16.62357958259917,20.13789742492002 -2,2022.0,1,6.581565054424906,3.7625585598592344,5.189007742254907,6.650376286090337,8.132597544265389,9.490689769722136,Male,4035.321269824903,32749.86771081833,46.57110605833659,33.04191787358952,39.53062794083497,46.58757127961917,53.494940466763374,60.06022886985182,4976,51.54482348156413,38.14655890210083,44.870125930664656,51.7944201853871,58.548100736841505,64.77739215920172,12.290378237129344,5.373430946439449,8.625994356830208,12.169335594366268,15.77852897602972,19.444346011440235 -2,2022.0,1,6.403665895590345,3.5615256941043176,5.014041924123162,6.47817601424474,7.930083958644523,9.297757796526861,Female,4061.612509824883,33337.48465244334,44.57993650954105,31.15894669990325,37.803952714931654,44.61317681656286,51.49557544910331,57.695451063328406,5206,50.560160777728214,36.182208835844726,43.601112547320795,50.86208869986905,58.17536042460013,64.38589360559739,13.67858464804883,6.513462466606176,9.894713046707965,13.667567948330351,17.2659182434125,20.75744827989004 \ No newline at end of file +2,2020.0,1,6.509195872726569,3.666629979811768,5.110018807966785,6.619074518730573,8.050446898834894,9.321368309716895,Total,8052.727800080246,65684.29555168381,45.502639145988944,32.43772436242931,39.03657766974644,45.88721610628178,52.4742393436807,58.31503241895764,10091,50.89091606383866,37.174948379036,44.96261479428665,51.883962928116496,57.997743174443464,62.91252757344372,13.051430897198921,6.124719152343431,9.196898810754597,12.733151487109449,16.5652627260464,20.372300517049634 +2,2020.0,1,6.5575615310872495,3.724977507822897,5.201773214465621,6.665177303101166,8.057903850950515,9.349738871552018,Male,4040.96017528974,32466.487140412974,46.708042214021916,34.3043870842016,40.5711263088057,47.00679958049616,53.35884911825063,59.132883462962,4951,51.35120121758655,38.50854601383822,45.49248349772136,52.127473711086665,58.14250559104267,63.098834252806526,12.26427447837561,5.645196424118601,8.560317033227413,11.979478572454429,15.60398023667873,19.399119115930926 +2,2020.0,1,6.462608640325107,3.6274023499433077,5.016321556438025,6.565589188408273,8.041239099408836,9.30870776720239,Female,4011.7676247905038,33217.80841127105,44.34155926469889,31.021223801571868,37.842026676501774,44.803658534672856,51.40791879316601,57.2157792214177,5140,50.447555792203495,35.84724527676001,44.48547762780869,51.64875180048946,57.783409596751866,62.760051633847695,13.809643237586894,6.6774660739607254,9.907757780109456,13.451208734751608,17.341742590701216,21.34383455984448 +2,2021.0,1,6.459743427215573,3.6590457739543996,5.022392725948271,6.542397877121978,7.993797879252137,9.29309499039403,Total,8044.742095160113,65650.37245079187,45.24434241857531,31.810519570581206,38.41185517947147,45.45061350064804,52.30427124630998,58.318598235575074,10163,50.79489567032435,37.21437229082114,44.17307270018759,51.29921871206874,58.00510705236088,63.66003274333717,13.309738909351278,6.254440543374638,9.463890795435159,13.197967737479392,16.9803637927335,20.483303330584317 +2,2021.0,1,6.577663550626292,3.8191036350947996,5.155296301829822,6.65302249913263,8.13970166128855,9.396647727484224,Male,4010.0151921769766,32690.987846612672,46.40019533789604,33.50396483596867,39.70660515148446,46.61092621192373,53.203756411356906,59.22244598575484,4970,51.06437253157795,38.17871840103764,44.66009338183204,51.462073394009636,57.890683047569894,63.514488612416606,12.482349175496573,5.484142208734648,8.777940060375906,12.30273512682524,16.112730911467544,19.620346246923955 +2,2021.0,1,6.3468870795647225,3.5363241370359075,4.8862759196411165,6.437252078477991,7.8753180337627,9.186788558715405,Female,4034.7269029830995,32959.384604179606,44.1381246236543,30.651938598471453,37.02643962275955,44.249433060763835,51.36383361022778,57.3561558677418,5193,50.536990798298,36.30447999648806,43.59813633317065,51.16195366733464,58.127374530713226,63.821395630735445,14.101598523689377,7.118865757110769,10.245115607298498,13.969030011072313,17.81810980500613,21.138361062010752 +2,2022.0,1,6.3655816145266755,3.519940708758478,4.9765921667765936,6.423976961278402,7.893337428020306,9.271915078596605,Total,7972.402017969772,64935.298049786616,45.04520267814988,31.852772604407175,38.11218211214622,45.072362326409625,52.040215890267675,58.34036177432258,10201,50.29460105096659,36.28644684346276,43.40210121250614,50.63180650973143,57.621207770304906,63.80390272227826,13.172324180856522,6.058397107493653,9.411835044809798,13.055995130204082,16.80254215577852,20.39008832150197 +2,2022.0,1,6.444130143817925,3.5878187716614574,5.057299111409764,6.502585308602009,7.98872376265366,9.364220506140457,Male,3976.661814070724,32149.765287507627,46.01183121107226,32.67317353745193,39.03442571780758,46.04833122651491,52.994816499400336,59.37448656613072,4989,50.781825004856856,37.24965335557038,44.126053653441105,50.94570529134404,57.91065926424896,63.978109161705994,12.444753614835763,5.475027651097207,8.789076382141428,12.318773540082468,15.940679898480997,19.662764819568945 +2,2022.0,1,6.290393853085022,3.454429526074865,4.9027260836536515,6.339396482812649,7.816654822206415,9.189703599008292,Female,3995.7402038990326,32785.53276227914,44.11993219642472,30.83569119871205,37.20530987511487,44.12355462018469,51.1065525417214,57.335652355009174,5212,49.82822340208708,35.23319585738041,42.7360492240634,50.204944184445864,57.35202632827894,63.65363867145129,13.86876500086382,6.67679360362766,10.075594033004075,13.840764623845793,17.5672547590672,21.08213697977909 \ 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 e4f667657..7f94b7873 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,15256.953965109053,0.0,0.0,0.0,15456.781759590931,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -1,2020.0,1,16104.945563508783,0.0,0.0,0.0,16126.300224195558,6.002947624785629,7.393700990590142,8.079014685308639,8.651826215326523,612.4114548496958,1474.3612945063908,2411.3833648998984,4025.4346348418517 -1,2021.0,1,16435.131736457668,0.0,0.0,0.0,16439.467604997673,6.2464722578676755,7.499677747417578,8.14311263626869,8.67226474731904,741.3055696526761,1530.1128549654093,2477.1567456816874,4169.443971447402 -1,2022.0,1,16809.48942744808,0.0,0.0,0.0,16809.48942744808,6.330679709607335,7.518713689219152,8.163881195601586,8.71856565517579,774.0122331531124,1582.8067271329003,2565.3063726163296,4254.7177606732885 +1,2020.0,1,16065.56996911624,0.0,0.0,0.0,16084.324518640067,5.937284423090114,7.361264171720244,8.070738343960802,8.641699168765305,621.2036640356451,1473.1502319140643,2405.7338770957545,4020.665847905158 +1,2021.0,1,16312.991546103864,0.0,0.0,0.0,16320.519042183992,6.156278029152681,7.462416804765393,8.125994749586157,8.661845904817552,762.6434689217089,1553.1512704629502,2508.8401145133416,4194.572293595888 +1,2022.0,1,16763.507984536696,0.0,0.0,0.0,16762.21724313722,6.264598999440321,7.506597532466106,8.153992385591756,8.695941315054714,785.2727206157408,1595.1273178709018,2559.6843720324573,4259.876514267428 2,2019.0,1,15256.926298340906,0.0,0.0,0.0,15450.417507924612,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -2,2020.0,1,16548.090983426686,0.0,0.0,0.0,16568.972587139775,5.830499134973755,7.416147336481695,8.167623512530024,8.779955942560406,636.0411789419483,1641.868120592153,2759.2643832565886,4755.702696078421 -2,2021.0,1,16999.624175226993,0.0,0.0,0.0,17007.283621711525,6.2288262253190645,7.538987724838364,8.245354848140922,8.816076735170538,764.6593667571285,1760.9038356718775,2917.8901046922747,4922.88267274707 -2,2022.0,1,17281.852851111013,0.0,0.0,0.0,17282.26758925488,6.280117026641237,7.563094285336055,8.257146162932948,8.844687724877884,851.2931125174935,1839.9192461896034,3021.9846023731675,5040.810236557234 \ No newline at end of file +2,2020.0,1,16485.09307744247,0.0,0.0,0.0,16512.980028708553,5.689177805621761,7.395258871343556,8.155009381334589,8.773340220739506,639.5337807962555,1637.9640721610126,2744.700067382654,4765.192361218382 +2,2021.0,1,17028.447251535785,0.0,0.0,0.0,17031.88043148179,6.096680079497623,7.514162136869929,8.231821493007068,8.806308071772344,812.8560487512741,1800.2870650274347,2947.445902416669,5013.069428725459 +2,2022.0,1,17145.08282844686,0.0,0.0,0.0,17144.389647576627,6.228512056004592,7.522957682815179,8.242895749264544,8.83634080487918,838.7233897938015,1830.9477440060798,3013.10738892652,5052.054769900501 \ 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 5f4991335..e18277154 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.05811554332874828,0.09130434782608696,0.06236811254396248,0.2620357634112792,0.6720496894409937,0.5969519343493552,0.29332874828060523,0.9503105590062112,0.07409144196951935,2908.0,6440.0,4265.0,3.69050894085282,3.4482919254658384,3.092379835873388,0.0021834914718019127,-0.0201199603173437,-0.02022802981366459,0.036602920750293144,0.561554332874828,0.6751552795031056,0.2797186400937866,0.09353507565337002,0.140527950310559,0.08253223915592028,0.0,0.0,0.0,-220.98483429553175,-459.2130693789786,-563.0006789520651,1065.2273871330394,1640.3078493710213,1515.844915690792,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.34744375,-1108.3894350892856,-1343.6696142857143,-1403.9432562499999,NaN -1,2020.0,1,0.05788005578800558,0.0962708690903417,0.07024029574861368,0.43235704323570434,0.7603370260571072,0.6448706099815157,0.32391910739191077,0.9753471680449368,0.08133086876155268,2868.0,6409.0,4328.0,3.584030683403068,3.3867998127633014,3.0499075785582255,0.010829385355648535,-0.03269728651231163,-0.04102475007021375,0.016691138262476923,0.49860529986053,0.7409892338898424,0.3213955637707948,0.14783821478382148,0.09549071618037135,0.06076709796672828,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.1253033385323,-1107.798049097802,-1342.878666623434,-1403.849348866661,-2.028132400574429 -1,2021.0,1,0.054206265399507216,0.08255597014925373,0.05136363636363636,0.4343541006687786,0.7762748756218906,0.6556818181818181,0.3350932770151355,0.974502487562189,0.08477272727272728,2841.0,6432.0,4400.0,3.552270327349525,3.3664490049751246,3.0793181818181816,-0.016433541393875428,-0.06726697109632124,-0.08063310845771145,-0.018646199999999946,0.5311510031678986,0.7927549751243781,0.355,0.14255543822597677,0.08333333333333333,0.0625,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.0882343136345,-1107.755465486301,-1342.8363701288931,-1403.8435746078512,-1.0063929650563206 -1,2022.0,1,0.05967005967005967,0.09243697478991597,0.0572987721691678,0.37662337662337664,0.7570806100217865,0.651887221464302,0.31905931905931906,0.9545596016184251,0.08685766257389722,2849.0,6426.0,4398.0,3.4383994383994385,3.3040771864301277,2.9531605275125057,-0.02050877778167781,-0.08211374941856214,-0.09312245328353563,-0.04407480391086849,0.5226395226395226,0.800964830376595,0.3769895407003183,0.15514215514215515,0.08761282290694056,0.06593906321055025,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.0427304049591,-1107.7703055995398,-1342.8878369473898,-1403.8070716775273,3.2592917342803744 +1,2020.0,1,0.07297486033519553,0.1459375,0.08992140545538604,0.44273743016759776,0.75625,0.644244105409154,0.32891061452513964,0.9734375,0.08136846971798428,2864.0,6400.0,4326.0,3.559357541899441,3.3240625,2.9956079519186316,0.01586228547486035,-0.028118801618837397,-0.0314198,0.01327821054091538,0.5,0.7325,0.32501155802126674,0.14141061452513967,0.094375,0.06056403143781785,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.120655216829,-1107.796714413592,-1342.8795334112942,-1403.843282246953,-2.270748170300507 +1,2021.0,1,0.07062146892655367,0.12920822942643392,0.07643312101910828,0.4399717514124294,0.774002493765586,0.6558234758871702,0.3375706214689266,0.9696072319201995,0.08575978161965424,2832.0,6416.0,4396.0,3.4671610169491527,3.2626246882793017,2.9585987261146496,8.463463276836003E-4,-0.05978437132805631,-0.0700373187032419,-0.022438283712465812,0.525776836158192,0.7817955112219451,0.36010009099181073,0.1306497175141243,0.08369700748129676,0.06119199272065514,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.081717002472,-1107.7626595059883,-1342.8522816316004,-1403.857871107739,-0.7949514034259401 +1,2022.0,1,0.06895344767238362,0.12665112665112666,0.07688818326151055,0.3846692334616731,0.7563325563325564,0.6547970061238376,0.32866643332166606,0.9552447552447553,0.08754819687003856,2857.0,6435.0,4409.0,3.3864193209660485,3.231857031857032,2.9042866863234296,-0.011610544172208637,-0.07834492552368438,-0.08473128018648018,-0.050681241959627976,0.5215260763038152,0.7958041958041958,0.3853481515082785,0.14735736786839343,0.08438228438228439,0.06418689045134951,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.068643163308,-1107.7921658589644,-1342.9066015197193,-1403.7995023708902,2.7789114336393963 2,2019.0,1,0.05807560137457045,0.09109248913718188,0.0625732364659011,0.26082474226804125,0.6719428926132837,0.5978439184438715,0.2934707903780069,0.9497206703910615,0.07429107101007734,2910.0,6444.0,4267.0,3.689347079037801,3.450651769087523,3.089289899226623,0.0019464395189003336,-0.020478632743557712,-0.020652807448789584,0.036303999203187276,0.5618556701030928,0.675667287399131,0.28005624560581205,0.09347079037800687,0.1404407200496586,0.0824935551910007,0.0,0.0,0.0,-220.29699124714057,-458.1635502021104,-560.3573828031367,1065.9152301814306,1641.3573685478896,1518.4882118397204,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.34744375,-1108.3894350892856,-1343.6696142857143,-1403.9432562499999,NaN -2,2020.0,1,0.05886450714036921,0.09736719115126967,0.07085160396953612,0.4287704632532219,0.7569714908864309,0.6478190630048465,0.3333333333333333,0.9691540738432778,0.08331410108469882,2871.0,6419.0,4333.0,3.582723789620341,3.3782520641844522,3.039464574198015,0.01881939947753397,-0.026844385656610126,-0.03302275606792335,0.018055277036695183,0.49773598049460116,0.7378096276678611,0.32333256404338795,0.14071752002786486,0.09066832840006231,0.05746595891991692,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.1061329211112,-1107.7901177566039,-1342.8783564911928,-1403.8521133348154,-0.934928925220003 -2,2021.0,1,0.05381944444444445,0.08806774441878368,0.05657805044308112,0.4392361111111111,0.7733641262509623,0.6580322653942285,0.35347222222222224,0.9716705157813703,0.08884344467166554,2880.0,6495.0,4401.0,3.564583333333333,3.371362586605081,3.056805271529198,-0.013560433333333344,-0.06271516910569103,-0.07321300631254812,-0.014688576732560743,0.5392361111111111,0.7862971516551194,0.35310156782549423,0.13159722222222223,0.08237105465742879,0.06044080890706657,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.084618133556,-1107.7520920834556,-1342.832417934978,-1403.8647842363116,-0.6295051591373106 -2,2022.0,1,0.06439127375087966,0.09208074534161491,0.060331140848264915,0.3673469387755102,0.7495341614906832,0.6591063733272851,0.33040112596762844,0.9343167701863354,0.09049671127239736,2842.0,6440.0,4409.0,3.4437016185784657,3.3088509316770187,2.9544114311635292,-0.007048000774102725,-0.0754945422978599,-0.0874640546583851,-0.04047484595146289,0.5070372976776918,0.7928571428571428,0.3783170787026537,0.15728360309641098,0.09006211180124224,0.061011567248809254,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.0768669874333,-1107.8063965395245,-1342.925271232315,-1403.822521105479,3.4575656332041094 \ No newline at end of file +2,2020.0,1,0.07579972183588317,0.14958664794883794,0.09141274238227147,0.4363699582753825,0.7546404617064421,0.6488919667590027,0.33588317107093185,0.9722352207143972,0.08240997229916898,2876.0,6411.0,4332.0,3.5549374130737137,3.322414599906411,2.9879963065558632,0.023058713630041694,-0.022334815140612363,-0.022981861300889084,0.014273929270544827,0.4972183588317107,0.7309312119794104,0.3275623268698061,0.13699582753824757,0.08750584932147872,0.05701754385964912,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.1007670688962,-1107.7919104503578,-1342.8841161602782,-1403.8537779244875,-0.9412781391272628 +2,2021.0,1,0.07200561995082543,0.13789897737837,0.08066348557146104,0.43765367053038284,0.7730089866749302,0.6559872756191775,0.3407095187917106,0.9638983576076852,0.08793456032719836,2847.0,6454.0,4401.0,3.475588338602037,3.2680508211961574,2.9470574869347876,8.990035124689655E-5,-0.057640098467377,-0.06416673988224356,-0.022641314746648433,0.5307341060765718,0.7792066935233963,0.36173596909793226,0.12644889357218125,0.08041524635884723,0.0597591456487162,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.080108571241,-1107.7476529747848,-1342.8292313026784,-1403.863133366981,-0.7890825257785715 +2,2022.0,1,0.07203092059030218,0.12639405204460966,0.07882219705549263,0.37210119465917074,0.7495353159851301,0.6552661381653454,0.3274771609276177,0.9417596034696406,0.09060022650056625,2846.0,6456.0,4415.0,3.4065354884047787,3.23683395291202,2.8908267270668175,-4.923846099789131E-4,-0.07301135074724796,-0.08031927335811648,-0.04712581494903734,0.5077301475755446,0.7877942998760843,0.3845979614949037,0.1500351370344343,0.08798017348203221,0.061381653454133635,0.0,0.0,0.0,NaN,NaN,NaN,NaN,NaN,NaN,0.0,0.0,0.0,NaN,NaN,NaN,0.0,0.0,0.0,0.0,0.0,0.0,-720.0640819575085,-1107.7837494626672,-1342.8972281938502,-1403.809875880029,3.1939710891582944 \ No newline at end of file