diff --git a/input/reg_income.xlsx b/input/reg_income.xlsx index c0998ac99..fe188aa2a 100644 Binary files a/input/reg_income.xlsx and b/input/reg_income.xlsx differ diff --git a/src/test/java/simpaths/integrationtest/expected/AlignmentAdjustmentFactors1.csv b/src/test/java/simpaths/integrationtest/expected/AlignmentAdjustmentFactors1.csv index ef10d43fa..843c7c7b1 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.3294559099437148,0.4270193670288144,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.9227951948432465,0.48757763975155277,0.5,0.3946153846153846,0.46794871794871795,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.6144920895048563,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.5859969558599696,0.9292551600358959,0.4968454258675079,0.4911111111111111,0.4233060312732688,0.4943127962085308,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.4530541291186285,0.5097880138188646,0.0,0.048714144411473786,0.04938041570024613,0.0,0.30343569474004256,0.2648949027061462,0.0,0.6114969135802469,0.6104874014854431,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 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.8993448481238833,0.46539792387543255,0.49336283185840707,0.32274934628315277,0.424,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.5205761316872428,0.5346715328467153,0.917028670721112,0.49226006191950467,0.4981060606060606,0.3816240945482272,0.4680954700438383,0.5382718801505548,0.5130523068280014,0.8776418122289941,0.3980978816455363,0.4641592336214714,0.4451259300414946,0.4776386065456221,0.0,0.0693359375,0.04833442666835588,0.0,0.3032316520688614,0.2792655229568481,0.6963461123195624,0.6335985626283368,0.6310330629348755,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -2,2022.0,1,0.5,0.5669781931464174,0.9274832419256551,0.49528301886792453,0.49616858237547895,0.41851986875683556,0.49280742459396754,0.5382469728746202,0.5423248579660446,0.8712018643202526,0.4133664269810563,0.4635896862300199,0.4530541291186285,0.5097880138188646,0.0,0.048666007905138337,0.04938041570024613,0.0,0.31293759512937597,0.2648949027061462,0.0,0.6077348066298343,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.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 diff --git a/src/test/java/simpaths/integrationtest/expected/EmploymentStatistics1.csv b/src/test/java/simpaths/integrationtest/expected/EmploymentStatistics1.csv index 40f4062bf..1b3b93c4d 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.7549962990377498,0.017055655296229804,0.37520042757883487,0.1052718151163747 -1,2022.0,1,0.7653805193741297,0.024130966301690232,0.2925531914893617,0.09838617186859998 +1,2021.0,1,0.7550785426433095,0.017280071813285457,0.3768038482095136,0.10518957151081504 +1,2022.0,1,0.7656365275842282,0.02423469387755102,0.29309035687167806,0.0988605623411755 2,2019.0,1,0.7128238983330583,0.0,0.0,0.15514111239478462 -2,2020.0,1,0.7118686034995048,0.08054987502840263,0.3896863370547581,0.1563222185539782 -2,2021.0,1,0.749267578125,0.01794526693584567,0.3625701172870984,0.11368815104166667 -2,2022.0,1,0.7578534031413613,0.025056215868936717,0.2981843575418994,0.10258507853403141 \ No newline at end of file +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 diff --git a/src/test/java/simpaths/integrationtest/expected/HealthStatistics1.csv b/src/test/java/simpaths/integrationtest/expected/HealthStatistics1.csv index ab2d0fb5d..0d486c234 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.614806277820939,3.7652355184266857,5.222159166466565,6.73130080543587,8.167188927274207,9.45956341274334,Total,8122.234182597935,66670.63247415725,45.90342611199893,32.76041987699348,39.425043675855456,46.32990279244976,52.889580175608465,58.779144471354584,10079,51.314342379913974,37.465146285572544,45.45385183126206,52.34846463570141,58.46412703157919,63.46259609758929,12.66129172949517,5.742782402250355,8.795173831748784,12.318044450919373,16.18488573396826,20.002347795486234 -1,2020.0,1,6.626682939869295,3.805744796504718,5.29191430833556,6.7436549444174805,8.14092961555648,9.448738725825232,Male,4089.700484077567,32755.693771773927,47.16050603926155,34.72060242044466,40.92513830937019,47.45773118565858,53.81656104438177,59.635697316209274,4943,51.998524755031596,39.09571334878134,46.15503257361284,52.75851350330392,58.80535525171222,63.8502526991901,11.931928480528107,5.295914143632904,8.215790931227666,11.645461286448139,15.335487311411011,18.97702901756019 -1,2020.0,1,6.603375915573099,3.7461330212911594,5.148107115427289,6.7153196174055685,8.193749301404642,9.471154701795063,Female,4032.5336985203794,33914.938702383435,44.69358458542929,31.334291564943996,38.157554028392056,45.15482563930577,51.82957716526933,57.61215428517951,5136,50.65587012909507,35.8760350944908,44.56128969365746,51.917407081210044,58.11668037935321,63.0865913427466,13.363247052634469,6.193221791258625,9.427872920776764,12.977155665563702,16.890748644600226,20.980411232741655 -1,2021.0,1,6.611655149658419,3.8628555893623755,5.222120335689433,6.7095704449233935,8.142232393005877,9.417434441271515,Total,8156.61753999513,66995.90163148876,45.69566709643756,32.45516358093217,38.87405983603978,45.901177664056846,52.75675898731781,58.75349022257982,10133,51.55096723075602,37.93485262724087,44.96105706987642,52.10947487040213,58.81202144677866,64.4353735547788,12.86972755062471,5.792211815704172,9.032797458734567,12.727740886322138,16.529523780072335,19.98479791441045 -1,2021.0,1,6.654289235536718,3.9160058856568685,5.266355327560401,6.738916812395925,8.203073631808438,9.462538650692277,Male,4079.115603466579,32952.040294377824,46.97320952281268,34.12550007799661,40.29171310693995,47.099174898448425,53.83401531909051,59.791115077297924,4952,52.04523090318215,39.12879168094947,45.64323395301296,52.467442690378284,58.870663338717485,64.49604686696033,12.293347339167104,5.201998480829695,8.608814351758165,12.154837481448393,15.879269423573962,19.461438362160578 -1,2021.0,1,6.570905488730111,3.784065602831976,5.173713729142071,6.68403775670342,8.086581747741425,9.367968579269563,Female,4077.501936528548,34043.861337110706,44.47459199599183,31.073933089580763,37.25982990604585,44.60862716316909,51.7118062130922,57.72929548136844,5181,51.07854999357153,36.741831292975306,44.19240025129689,51.74356051880231,58.763136326279266,64.38445031464674,13.420631778985733,6.394677337482969,9.507171185812087,13.290422574140345,17.130870431259655,20.424006333716136 -1,2022.0,1,6.459690058036056,3.6079702611587123,5.08081240181248,6.532069642427167,8.001919844836074,9.337537342635692,Total,8074.548513238369,65688.58820016866,45.47117344207359,32.238677750263726,38.65104181818477,45.47798121988921,52.485383593420295,58.60638612175104,10169,50.94556337236834,37.075140709171855,44.09975548697967,51.30038729860026,58.2208107693433,64.35477317872903,12.82955630961602,5.805021342228207,9.055200285774957,12.7404315092765,16.431735022502448,19.93060679776495 -1,2022.0,1,6.490948026621022,3.628183333772721,5.102270902250162,6.559616883895012,8.034049957582962,9.361019640912986,Male,4046.396788664368,32292.466432439585,46.62000860623988,33.443531575995934,39.730041617343645,46.602759360907704,53.45414622756339,59.76875867585145,4975,51.605943974511,38.089352291347815,44.875524992391,51.88949612485328,58.60570999984539,64.76416751293903,12.287128226063336,5.393530234863877,8.599990818027766,12.229801943348066,15.814146927155242,19.389938089234814 -1,2022.0,1,6.429750051545874,3.591411965597947,5.061247247543556,6.508698175450156,7.96507806086835,9.317256142226789,Female,4028.1517245739556,33396.121767729266,44.3707778044669,30.86055220587854,37.58549593894383,44.4776084895734,51.32581597939195,57.32777413476521,5194,50.31302708132846,36.10000413040933,43.40401836845294,50.70320454688626,57.911514672894484,64.04049658459974,13.349113436238063,6.2719284093892895,9.590357916964301,13.283508298491999,16.9376504076224,20.510093407640518 +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 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.648790403612972,3.7983695000228566,5.247428877536995,6.765453938693191,8.214569954104112,9.498397166986376,Total,8160.523970175109,67119.53912447295,45.99266482254266,32.821783768474845,39.461025021565824,46.35410937959559,53.02358448781876,58.835433726929615,10095,51.43392355566378,37.64004187077226,45.519656409098765,52.44772412348234,58.54473483932033,63.56787563972361,12.891241611668004,5.941239718920905,9.038214182406618,12.561652076455049,16.389742385253584,20.209999590600944 -2,2020.0,1,6.702122202626283,3.8879612847729885,5.348589940680837,6.8156422092581455,8.229292733365684,9.522610106957654,Male,4098.126318497242,33215.71763621586,47.22849202285219,34.747877759176475,41.05400091483066,47.5476118356395,53.86249506436657,59.6908719208839,4956,51.91277957421135,38.9945168300227,46.05912908011382,52.68552387774127,58.71409676267968,63.78261288665822,12.09681131937212,5.465454750723371,8.409656342447645,11.851678288503715,15.415025233216248,19.120846574353234 -2,2020.0,1,6.5973577521418765,3.752745435962728,5.154152833450976,6.711522847836678,8.192529032539117,9.474410230609504,Female,4062.397651677836,33903.821488257105,44.80084547933732,31.299839260810792,38.26705188189283,45.26115460765929,51.946682591602524,57.74689782848656,5139,50.97211961950472,36.26331609664513,44.927483108460294,52.18264236825294,58.36347553214964,63.3381980500193,13.657382208791748,6.517946352244499,9.786980804629348,13.296050659163345,17.16345568379975,21.229257231262174 -2,2021.0,1,6.631287679133615,3.883261161734364,5.216708477773616,6.722507271816023,8.16926901961195,9.447273217295852,Total,8267.448721995332,68003.85514951522,45.80402254302271,32.48647532582605,38.936908079835234,46.03498659307995,52.81212437024774,58.906811140603786,10255,51.59047140279496,37.85711167349786,45.01833283555787,52.08706985815784,58.84079517484475,64.56285232362237,13.092153683149728,6.07831935728023,9.270172251798023,12.931184927196197,16.73011876679543,20.252218506787877 -2,2021.0,1,6.742569477375246,4.022672591545094,5.334846660303073,6.819951385038663,8.295124039640903,9.546422511912066,Male,4120.082366505448,33813.985929036855,47.03471109674549,34.07962265492657,40.348440610166364,47.32840968744233,53.816406583010384,59.94509758569303,5015,51.86155350567446,38.85862267126504,45.40391976874746,52.328485150762816,58.74719285395685,64.45373962895418,12.300142202537062,5.218549419494089,8.672003761040989,12.10795252162202,15.852963633700186,19.46648452710797 -2,2021.0,1,6.524784202381323,3.7529909163616257,5.116659101920391,6.63202000718066,8.045250382033414,9.330247331650067,Female,4147.366355489902,34189.86922047813,44.62617844055702,31.280525580617784,37.481817048259785,44.75594184166033,51.77970855977166,57.80692749782618,5240,51.331029275707046,37.00052896518403,44.510329857039245,51.93341905277687,58.92958915446562,64.60789355108751,13.850157037209385,6.941045654688935,9.975525387886835,13.709151416170435,17.53247821828921,20.89274407748055 -2,2022.0,1,6.49485459981958,3.6344664647608234,5.098028742832679,6.564072890352545,8.03063143505382,9.406133257326047,Total,8102.129805349514,66169.57866296188,45.54508923087904,32.21338860455661,38.67070726791199,45.569389607397284,52.5870680452947,58.7033626847891,10188,51.033119401938514,37.18195456408301,44.1882873245048,51.32093110530256,58.33901880860271,64.51956666511936,12.996007696485565,5.937835865661806,9.245214795576187,12.914365591387968,16.604284638648807,20.127843833184865 -2,2022.0,1,6.576024139361841,3.7582936287184476,5.171512681308358,6.651076971923019,8.134037012541988,9.486908631365223,Male,4038.38455569659,32728.87214160388,46.613489495024815,33.10085322126523,39.598017694792816,46.638969691049624,53.556485478667625,59.966177045631085,4977,51.53644736354717,38.07454817342117,44.8735989359306,51.850984403755255,58.51001194888701,64.73401554066339,12.277615806906802,5.3622944593315145,8.611532470437123,12.175063182053751,15.809541348327947,19.442017580814156 -2,2022.0,1,6.417329979151441,3.5665809946476976,5.031621919469906,6.497047858551481,7.954107801535328,9.314003619484717,Female,4063.7452496529136,33440.70652135816,44.52466548982069,31.247751554361763,37.75860039292136,44.54520739536181,51.46919319543207,57.58229193704942,5211,50.5523933867924,36.16281645738655,43.573460526666544,50.83731342844708,58.13605550862925,64.40158397528673,13.682140192059052,6.5485365469227235,9.911335628389768,13.668687551686856,17.24898890229864,20.757339717540358 \ No newline at end of file +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 diff --git a/src/test/java/simpaths/integrationtest/expected/Statistics1.csv b/src/test/java/simpaths/integrationtest/expected/Statistics1.csv index 96ba35a73..e4f667657 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,16017.875413763875,0.0,0.0,0.0,16025.78909016308,5.975730539439618,7.381070828732318,8.073427570055065,8.645695057327014,609.403627389382,1469.141405159927,2401.5176840440963,3996.456622653555 -1,2021.0,1,16354.51086138939,0.0,0.0,0.0,16358.913014905334,6.227870463281269,7.492111986282805,8.13608070151509,8.664200853259567,737.3156983816176,1523.79416549561,2464.3681424805504,4150.759607270258 -1,2022.0,1,16690.411161774107,0.0,0.0,0.0,16690.411161774107,6.318883652232151,7.514412811740821,8.160250057938411,8.710171469689,771.5590174571798,1576.4285263414033,2551.7197279883662,4207.964709427611 +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 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,16431.943854802594,0.0,0.0,0.0,16453.618220334713,5.818391825850994,7.4120169593935445,8.163204871228126,8.77411874493853,634.2126456275846,1637.96284465107,2748.1796360023063,4713.014918106409 -2,2021.0,1,16957.07532931993,0.0,0.0,0.0,16966.740717782483,6.217847826271187,7.5392475592455455,8.241424114366975,8.813522210911874,753.6728440357319,1746.9474393607386,2900.445917723555,4887.21702162078 -2,2022.0,1,17161.478625887503,0.0,0.0,0.0,17162.301567662555,6.26366135568786,7.556009619907757,8.251258095747177,8.844448670386775,852.6944985072745,1835.8327951279102,3017.709599769617,5057.2303575567375 \ No newline at end of file +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 diff --git a/src/test/java/simpaths/integrationtest/expected/Statistics21.csv b/src/test/java/simpaths/integrationtest/expected/Statistics21.csv index 6288b8b65..5f4991335 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.040868719488219685,0.01646008465804072,0.49860529986053,0.7414573256358247,0.32162661737523107,0.14783821478382148,0.09486659385239507,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.08271144278606965,0.05204545454545455,0.4343541006687786,0.7762748756218906,0.6556818181818181,0.3350932770151355,0.974502487562189,0.08477272727272728,2841.0,6432.0,4400.0,3.552270327349525,3.3666044776119404,3.078409090909091,-0.016433541393875428,-0.06719383425729542,-0.08078858109452736,-0.01819165454545446,0.5311510031678986,0.7925995024875622,0.355,0.14255543822597677,0.08364427860696518,0.06204545454545454,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.05931905931905932,0.09259259259259259,0.05759637188208617,0.3776763776763777,0.7573918456271398,0.6532879818594104,0.31905931905931906,0.9554933084344849,0.08752834467120181,2849.0,6426.0,4410.0,3.435240435240435,3.3062558356676,2.956462585034014,-0.021561778834678857,-0.08164493613445378,-0.0934336888888889,-0.04218928390022669,0.5240435240435241,0.8015873015873016,0.3764172335600907,0.1547911547911548,0.0873015873015873,0.06462585034013606,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.0418198870248,-1107.7686527563578,-1342.8857628895557,-1403.8094498212508,3.2757647315505363 +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 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.018471088784395684,-0.027211412009102265,-0.03302275606792335,0.017132129102238713,0.49773598049460116,0.7379654151737031,0.3237941380106162,0.14106583072100312,0.09051254089422028,0.05792753288714517,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.05331010452961672,0.0888445603805432,0.056676490591702565,0.4397212543554007,0.7738223108792389,0.6588075266379506,0.35400696864111497,0.969157587847169,0.09000226705962366,2870.0,6517.0,4411.0,3.562369337979094,3.370415835507135,3.057129902516436,-0.0138072393728223,-0.06300491888679516,-0.07258224054012583,-0.016018111131262724,0.5400696864111498,0.7862513426423201,0.3545681251416912,0.13101045296167246,0.08178609789780573,0.06030378598957153,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.0804674583025,-1107.7528128341778,-1342.8376768905243,-1403.8649689256058,-0.6340316899668181 -2,2022.0,1,0.0633356790992259,0.09200930954228084,0.059904697072838665,0.3694581280788177,0.7491078355314197,0.6560018152938507,0.3289936664320901,0.9402637703646237,0.08963013387792149,2842.0,6445.0,4407.0,3.4440534834623504,3.308456167571761,2.9512139777626505,-0.007751730541871948,-0.0754884031254564,-0.08693424918541505,-0.040447311867483515,0.5073891625615764,0.7920868890612878,0.3769003857499433,0.15763546798029557,0.09030256012412723,0.06240072611754028,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.0719213185639,-1107.8033422928634,-1342.9235450839235,-1403.8230586933678,3.7453773311172247 \ No newline at end of file +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