Skip to content

Commit 07dae18

Browse files
andrewbaxter439andrewbaxter439
authored
Merge pull request #271 from centreformicrosimulation/260-align-predicted-educational-level-with-observed-outcomes
260 align predicted educational level with observed outcomes
2 parents 7dac89b + a99d09a commit 07dae18

8 files changed

Lines changed: 67 additions & 43 deletions

File tree

‎input/reg_education.xlsx‎

14.6 KB
Binary file not shown.

‎src/main/java/simpaths/data/Parameters.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,7 @@ else if(country.equals(Country.UK)) {
11941194
columnsFinancialDistress = 50;
11951195
columnsEducationE1a = 24;
11961196
columnsEducationE1b = 29;
1197-
columnsEducationE2a = 24;
1197+
columnsEducationE2a = 30;
11981198
columnsPartnershipU1a = 16;
11991199
columnsPartnershipU1b = 29;
12001200
columnsPartnershipU2b = 38;

‎src/main/java/simpaths/model/Person.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2308,6 +2308,12 @@ public enum DoublesVariables {
23082308
Dag_L1,
23092309
Dag_sq,
23102310
Dag_sq_L1,
2311+
Dag_u22,
2312+
Dag_sq_u22,
2313+
Dag_cb_u22,
2314+
Dag_22o,
2315+
Dag_sq_22o,
2316+
Dag_cb_22o,
23112317
DagCeiling54,
23122318
Dag_sqCeiling54,
23132319
Dcpagdf_L1, //Lag(1) of age difference between partners
@@ -2655,6 +2661,24 @@ public double getDoubleValue(Enum<?> variableID) {
26552661
case Dag_sq_L1 -> {
26562662
return (double) (dag - 1) * (dag - 1);
26572663
}
2664+
case Dag_u22 -> {
2665+
return (double) dag < 22 ? dag : 0;
2666+
}
2667+
case Dag_sq_u22 -> {
2668+
return (double) dag < 22 ? dag * dag : 0;
2669+
}
2670+
case Dag_cb_u22 -> {
2671+
return (double) dag < 22 ? dag * dag * dag : 0;
2672+
}
2673+
case Dag_22o -> {
2674+
return (double) dag >= 22 ? dag : 0;
2675+
}
2676+
case Dag_sq_22o -> {
2677+
return (double) dag >= 22 ? dag * dag : 0;
2678+
}
2679+
case Dag_cb_22o -> {
2680+
return (double) dag >= 22 ? dag * dag * dag : 0;
2681+
}
26582682
case DagCeiling54 -> {
26592683
return (double) Math.min(dag, 54);
26602684
}

‎src/test/java/simpaths/integrationtest/expected/EmploymentStatistics1.csv‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
run,time,id_EmploymentStatistics1,EmpToNotEmp,NotEmpToEmp,PropEmployed,PropUnemployed,
22
1,2019.0,1,0.0905460951262478,0.35991649269311066,0.6919775503466491,0.17076592934962034,
3-
1,2020.0,1,0.09059346859064772,0.22426631625054752,0.6728191774527074,0.19721222332848282,
4-
1,2021.0,1,0.070926143024619,0.2753338570306363,0.6740042758729907,0.19083062791986696,
5-
1,2022.0,1,0.06203789279112754,0.25500400320256206,0.6777068054569829,0.18713035249585994,
3+
1,2020.0,1,0.09134250731390182,0.22665497588776853,0.6733726000152988,0.1968178688900788,
4+
1,2021.0,1,0.06870407092033128,0.27419354838709675,0.6768769242914661,0.18891608115575906,
5+
1,2022.0,1,0.05772554441755963,0.2506122448979592,0.6821019359936784,0.18214144606874752,
66
2,2019.0,1,0.0901937756899589,0.36018363939899833,0.6924346176058082,0.17053048428347495,
7-
2,2020.0,1,0.0899837574445046,0.2289740202553941,0.6737767584097859,0.19441896024464833,
8-
2,2021.0,1,0.07079957731595632,0.27059291683247116,0.6729824005073728,0.19185032503567465,
9-
2,2022.0,1,0.05959268687803749,0.2591993530125354,0.679737528658392,0.185152976519883,
7+
2,2020.0,1,0.08905742145178765,0.22880983750548967,0.6748278500382555,0.19418515684774293,
8+
2,2021.0,1,0.07120345511847788,0.2751004016064257,0.6766780252000951,0.18907995879229733,
9+
2,2022.0,1,0.05922263109475621,0.25805136567468406,0.6826285894603976,0.1834174818554749,

‎src/test/java/simpaths/integrationtest/expected/HealthStatistics1.csv‎

Lines changed: 18 additions & 18 deletions
Large diffs are not rendered by default.

‎src/test/java/simpaths/integrationtest/expected/Statistics1.csv‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
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,
22
1,2019.0,1,11710.826601350129,0.0,0.0,629.0225592833064,1256.7997320334398,1863.977007377612,2822.356847997243,11710.826601350129,NaN,0.0,0.0,7.677087763295096,8.254591617183976,
3-
1,2020.0,1,12024.725900296515,0.0,0.0,0.0,1080.3569576524903,1806.568517136928,2843.6491613241315,12024.725900296515,NaN,0.0,0.0,7.688262181097593,8.303518955710432,
4-
1,2021.0,1,11865.829278189776,0.0,0.0,0.0,1233.1280052394086,1955.3338667028559,3033.804446546846,11862.969914031146,NaN,0.0,0.0,7.735585766688342,8.363504873994863,
5-
1,2022.0,1,12339.945688711285,0.0,0.0,27.86292061314274,1273.146100753053,2006.5360619859002,3088.040982623245,12336.21234584146,NaN,0.0,0.0,7.773515710900749,8.3892060368051,
3+
1,2020.0,1,12024.725900296515,0.0,0.0,0.0,1079.1873433429664,1806.0274358380248,2840.7964275423105,12024.725900296515,NaN,0.0,0.0,7.687101953793663,8.303140530738661,
4+
1,2021.0,1,12071.462660020243,0.0,0.0,0.0,1230.6020360313694,1961.4295688891834,3033.6357060708133,12070.787881366372,NaN,0.0,0.0,7.746360796220401,8.367243446741623,
5+
1,2022.0,1,12426.85573285835,0.0,0.0,216.97751677677903,1278.2952809749283,2028.8853589889795,3087.7993675425155,12426.571229527724,NaN,0.0,0.0,7.78293434922552,8.399324734338569,
66
2,2019.0,1,11710.826601350129,0.0,0.0,628.3272835669826,1255.1711549248664,1863.8967739684877,2822.1998469159994,11710.826601350129,NaN,0.0,0.0,7.677305869739233,8.25573270230405,
7-
2,2020.0,1,12024.725900296515,0.0,0.0,0.0,1085.4510921385522,1809.7404280323337,2837.907253288959,12024.725900296515,NaN,0.0,0.0,7.681324551867457,8.30133489320262,
8-
2,2021.0,1,11834.14149837555,0.0,0.0,0.0,1231.265262045304,1943.3633272488614,3012.899386084271,11834.14149837555,NaN,0.0,0.0,7.73293844597479,8.357194691530696,
9-
2,2022.0,1,12267.951972806783,0.0,0.0,148.38590500605866,1261.7141240151734,2013.1915731965116,3075.643798622905,12267.951972806783,NaN,0.0,0.0,7.764439243557929,8.394977488465818,
7+
2,2020.0,1,12024.725900296515,0.0,0.0,0.0,1085.2509182915849,1809.7404280323337,2836.7377308992523,12024.725900296515,NaN,0.0,0.0,7.683991835228723,8.30346358550098,
8+
2,2021.0,1,11853.328184235996,0.0,0.0,0.0,1234.417020436259,1958.3268397774598,3028.261470170822,11853.328184235996,NaN,0.0,0.0,7.741277957767225,8.368015063641442,
9+
2,2022.0,1,12319.297343010852,0.0,0.0,154.4800801948658,1270.8500729637854,2015.6497269728227,3095.589759646678,12319.297343010852,NaN,0.0,0.0,7.781209385446186,8.39143957443849,

‎src/test/java/simpaths/integrationtest/expected/Statistics21.csv‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
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,
22
1,2019.0,1,0.2716261646439728,-94.12636263283412,-473.86419168724,-904.393306340088,-720.1422638587416,-1107.8964854612511,-1343.025068974074,-1403.853060282238,-0.0014899865979381421,-0.004280433700602326,-0.010691005183920521,0.0756902233747947,0.2986254295532646,0.9365202545398107,0.07932410232339826,0.5388316151202749,0.6411609498680739,0.23844168035672378,0.11993127147766323,0.16498525531584665,0.08472189626848158,1192.085858795737,1625.65672706276,1174.4522883027691,3.7670103092783505,3.481763153810337,3.0880075099741844,0.0,0.0,0.0,0.0,0.0,0.0,387.6113833330806,524.8842243746953,511.32365028511634,0.0,0.0,0.0,2910.0,6443.0,4261.0,0.04673539518900344,0.08427751047648611,0.1476179300633654,0.24673539518900345,0.6683222101505509,0.6284909645623094,0.0,0.0,0.0,
3-
1,2020.0,1,-0.7412824951960196,2.2777539738697214,-459.5994536786284,-857.426209006182,-719.9624001701977,-1107.754911463381,-1342.9072642979413,-1403.8283521958288,0.012222774686716786,0.008484792378990746,0.018927639823386994,0.08083909411764711,0.4451754385964912,0.9908844893889759,0.078125,0.5025062656641605,0.6211365902293121,0.23988970588235295,0.1425438596491228,0.15539096994730095,0.078125,1288.489975402441,1639.9214650713716,1221.419385636675,3.6400375939849625,3.455063381284717,3.018612132352941,0.0,0.0,0.0,0.0,0.0,0.0,424.9887468118768,550.8349260896671,537.8882382208272,0.0,0.0,0.0,3192.0,7021.0,4352.0,0.043233082706766915,0.07463324312775958,0.16268382352941177,0.20614035087719298,0.6519014385415183,0.5824908088235294,0.0,0.0,0.0,
4-
1,2021.0,1,6.038861140513146,37.24824645930994,-417.1918748228884,-848.7886913852717,-720.0272022896505,-1107.8721906605665,-1343.05540916668,-1403.8152814550617,-0.0026205043970686237,0.00773043184713379,0.021567959643916917,0.07000238705560624,0.3944037308461026,0.8838278931750742,0.0820419325432999,0.4870086608927382,0.6169139465875371,0.2506836827711942,0.17288474350433045,0.156973293768546,0.07816773017319964,1323.4604678878811,1682.3290439271116,1230.0569032575854,3.5436375749500333,3.351186943620178,2.9250227894257064,0.0,0.0,0.0,0.0,0.0,0.0,436.3312934270817,572.2156114443399,553.991922607467,0.0,0.0,0.0,3002.0,6740.0,4388.0,0.046302465023317786,0.07670623145400593,0.17160437556973565,0.13257828114590273,0.5881305637982196,0.5510483135824977,0.0,0.0,0.0,
5-
1,2022.0,1,-0.7308918046908721,63.26093996959662,-396.7957314274254,-824.6800308822899,-720.0044120022212,-1107.9715532922958,-1343.2168880953288,-1403.7984195501992,-0.011937451692103529,3.6322129223809174E-4,0.02031781696123572,0.05377537308479208,0.4117451891174519,0.8248923214020496,0.07956353716753807,0.5096217650962177,0.6373087776622605,0.27006137758581494,0.15958858659588587,0.1378286053765038,0.07501704932939304,1349.4731613981678,1702.7251873225746,1254.1655637605672,3.4648307896483077,3.251596613693747,2.857240281882246,0.0,0.0,0.0,0.0,0.0,0.0,445.9900071631031,581.0750339286341,564.1329265728774,0.0,0.0,0.0,3014.0,6733.0,4399.0,0.04678168546781686,0.07945937917718698,0.17799499886337805,0.08858659588586595,0.5406208228130105,0.5283018867924528,0.0,0.0,0.0,
3+
1,2020.0,1,-0.7396376636182903,-5.621248069030116,-463.8349997127432,-857.9100879815733,-719.9639074271228,-1107.758994586653,-1342.9133168275778,-1403.8284447935937,0.011210772607467834,0.007943255917667258,0.01881410878090367,0.08069288045977019,0.4461876372764355,0.9889173060528559,0.07908045977011494,0.5032946344524631,0.6209150326797386,0.24045977011494252,0.14276749294006902,0.15572605853935778,0.07770114942528736,1280.590973359541,1635.6859190372568,1220.9355066612839,3.6379039849388137,3.453537936913896,3.0181609195402297,0.0,0.0,0.0,0.0,0.0,0.0,421.1344072730098,547.7875858758484,536.8004426039937,0.0,0.0,0.0,3187.0,7038.0,4350.0,0.043928459366175086,0.07402671213412901,0.16344827586206898,0.20363978663319737,0.6486217675475987,0.5822988505747126,0.0,0.0,0.0,
4+
1,2021.0,1,1.5371552433731444,38.77780105679335,-408.424041231664,-845.6590489551822,-720.0265934858982,-1107.8812634823505,-1343.0691822790654,-1403.8270916888673,-0.002885935208471191,0.004777550674292197,0.015455200000000002,0.07045480204964705,0.40502978160158837,0.8838518518518519,0.08244135732179458,0.4870946393117141,0.6231111111111111,0.2511956274197222,0.17306419589675712,0.15688888888888888,0.07720337053063084,1324.9900224853645,1691.096877518336,1233.1865456876749,3.5483123759099935,3.35037037037037,2.923252106581644,0.0,0.0,0.0,0.0,0.0,0.0,438.90331654560987,570.3704066679483,555.31520937226,0.0,0.0,0.0,3022.0,6750.0,4391.0,0.04765056254136334,0.07466666666666667,0.17330904122067867,0.13203176704169425,0.5860740740740741,0.5499886130721932,0.0,0.0,0.0,
5+
1,2022.0,1,-0.7009976618537205,56.02181676497776,-379.9602302386759,-820.5446534857722,-720.0351181878289,-1107.9669137995809,-1343.194728823921,-1403.797937152153,-0.007176717559028933,-0.0032109451596912253,0.010305356552855222,0.052813409711822135,0.41137346192218155,0.8279409572088863,0.08191513501248014,0.5071499833721317,0.6424630982555539,0.27002496029044704,0.15729963418689724,0.14268674519159089,0.07601542999773088,1342.234038193549,1719.560688511324,1258.300941157085,3.475557033588294,3.243775160280304,2.855911050601316,0.0,0.0,0.0,0.0,0.0,0.0,447.33816219552267,580.8714739620286,563.7719690651974,0.0,0.0,0.0,3007.0,6707.0,4407.0,0.05021616228799468,0.07603995825257194,0.18084864987519855,0.08513468573328899,0.537498136275533,0.5239391876560018,0.0,0.0,0.0,
66
2,2019.0,1,0.2845876542239716,-93.61108118972129,-472.3171099199144,-905.4313624145807,-720.1422638587416,-1107.8933571687894,-1343.0202640508362,-1403.855755672931,-0.0014899865979381421,-0.004372881938325968,-0.011086421454038126,0.0764776553651092,0.2986254295532646,0.9344287707332196,0.07912655552946701,0.5388316151202749,0.6414509378390947,0.23784926038976287,0.11993127147766323,0.16509068361494342,0.08452688424512797,1192.60114023885,1627.2038088300856,1173.4142322282764,3.7670103092783505,3.4822508138273136,3.0861704625498945,0.0,0.0,0.0,0.0,0.0,0.0,387.8666844244328,524.7776607256557,510.80211830770696,0.0,0.0,0.0,2910.0,6451.0,4259.0,0.04673539518900344,0.08417299643466129,0.1472176567269312,0.24673539518900345,0.667803441326926,0.6273773186193943,0.0,0.0,0.0,
7-
2,2020.0,1,-0.7401859408108667,-3.65652400649833,-470.3594224205442,-856.9316119517496,-719.9627661628167,-1107.7484995791774,-1342.8972697857114,-1403.8336901877963,0.012939775391358765,0.007676716420980445,0.018324518181818183,0.07938701075614807,0.44145272385723233,0.9867897727272728,0.07952194897724661,0.5015654351909831,0.615909090909091,0.24063433693403816,0.1427676894176581,0.1612215909090909,0.07883245230981384,1282.5556974220729,1629.1614963294558,1221.9139826911075,3.6333750782717598,3.4428977272727272,3.016777752240864,0.0,0.0,0.0,0.0,0.0,0.0,423.65794829018756,545.4157231087064,537.4620744923544,0.0,0.0,0.0,3194.0,7040.0,4351.0,0.04351909830932999,0.07528409090909091,0.16134222017926914,0.21102066374452097,0.6481534090909091,0.5828545162031716,0.0,0.0,0.0,
8-
2,2021.0,1,3.768372932834577,29.716396262071385,-430.91607377659193,-840.9584924421442,-720.0268141395673,-1107.8684002072016,-1343.0503022691519,-1403.8219898728742,-4.632018084393952E-4,0.008469982034570722,0.023861255209260912,0.06688658688524596,0.3868050904219692,0.8831997625408133,0.08128415300546447,0.4822505023442733,0.6150192935589196,0.25455373406193077,0.17548559946416611,0.15657465123181952,0.07741347905282331,1315.9286176906426,1668.604844973408,1237.887102200713,3.542866711319491,3.351291184327694,2.9234972677595628,0.0,0.0,0.0,0.0,0.0,0.0,436.16458811295627,568.2666073882294,557.0819406406845,0.0,0.0,0.0,2986.0,6738.0,4392.0,0.046215673141326186,0.07583852775304245,0.17053734061930784,0.13228399196249163,0.5934995547640249,0.5496357012750456,0.0,0.0,0.0,
9-
2,2022.0,1,-0.3934389035432281,72.57569096833754,-409.83224231218605,-812.2900371181581,-719.9994855060471,-1107.9596077300955,-1343.2012758965163,-1403.8044675810354,-0.013151503183023883,-0.0011375791002479763,0.0194874821700792,0.04903528820326686,0.4088196286472148,0.8320131519952174,0.08121597096188747,0.5106100795755968,0.6339859512778359,0.2731397459165154,0.15981432360742706,0.1419817665520849,0.07667876588021778,1358.7879123969087,1689.688676437814,1266.555557524699,3.47446949602122,3.2524286354804963,2.855036297640653,0.0,0.0,0.0,0.0,0.0,0.0,451.6194092675201,576.299940779068,568.0016971681073,0.0,0.0,0.0,3016.0,6691.0,4408.0,0.046087533156498675,0.07637124495591092,0.17558983666061706,0.08488063660477453,0.5492452548199074,0.5301724137931034,0.0,0.0,0.0,
7+
2,2020.0,1,-0.7356041067844614,-3.882030594810203,-462.36036417541595,-858.7604251130197,-719.9516035388953,-1107.738084179218,-1342.8873004622105,-1403.8347710076303,0.010748166123982439,0.0068034691642651635,0.0169193080312722,0.08055690701956275,0.44364433312460866,0.9883439943141435,0.07917146144994246,0.5037570444583594,0.6190476190476191,0.24004602991944765,0.1427676894176581,0.15948827292110873,0.07825086306098965,1282.330190833761,1637.160554574584,1220.0851695298375,3.6355666875391357,3.4460554371002132,3.0161104718066745,0.0,0.0,0.0,0.0,0.0,0.0,422.61947965021193,547.2266362492028,537.3627883393855,0.0,0.0,0.0,3194.0,7035.0,4345.0,0.043832185347526614,0.07448471926083866,0.161795166858458,0.2116468378209142,0.6436389481165601,0.5831990794016111,0.0,0.0,0.0,
8+
2,2021.0,1,7.532278887204714,27.840687632479785,-410.07228491331125,-839.5869166812527,-720.0248156795312,-1107.867533367163,-1343.0495197966075,-1403.8255153600974,-8.410620126624302E-4,0.005319293805309766,0.01710009311163896,0.06772344448495904,0.39986671109630123,0.8739608076009501,0.08067456700091158,0.4851716094635122,0.6239608076009501,0.25546946216955335,0.17294235254915027,0.1543942992874109,0.07566089334548769,1314.052909061051,1689.4486338366887,1239.2586779616045,3.542485838053982,3.348871733966746,2.9261622607110302,0.0,0.0,0.0,0.0,0.0,0.0,434.62939655485405,572.5133966453387,559.0729775640625,0.0,0.0,0.0,3001.0,6736.0,4388.0,0.047317560813062313,0.07467339667458432,0.17183226982680036,0.1339553482172609,0.5844714964370546,0.5487693710118505,0.0,0.0,0.0,
9+
2,2022.0,1,-0.40977782618841196,55.295742164051035,-393.2835893877691,-812.723996939545,-720.014204797536,-1107.9505613849997,-1343.1810686676477,-1403.8075455885728,-0.012727099999999991,-0.0037983071342713726,0.0156332415430267,0.04795668439700207,0.4023333333333333,0.8298219584569733,0.0794912559618442,0.5183333333333333,0.6403560830860534,0.27458550987962754,0.15166666666666667,0.1394658753709199,0.07631160572337042,1341.5079635926222,1706.2373293622309,1266.121597703312,3.467,3.2666172106824924,2.8503293209175564,0.0,0.0,0.0,0.0,0.0,0.0,442.16798038940937,581.8828160480113,566.1000752954905,0.0,0.0,0.0,3000.0,6740.0,4403.0,0.049,0.0755192878338279,0.17647058823529413,0.08533333333333333,0.5452522255192879,0.5305473540767658,0.0,0.0,0.0,

‎src/test/java/simpaths/integrationtest/expected/Statistics31.csv‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
run,time,id_Statistics31,fertilityAdjustmentFactor,fertilityRateSimulated,fertilityRateTarget,partnershipAdjustmentFactor,shareCohabitingSimulated,shareCohabitingTarget,socialCareAdjustmentFactor,utilityAdjustmentFactorCouples,utilityAdjustmentFactorSfemales,utilityAdjustmentFactorSmales,
22
1,2019.0,1,-0.279462622342386,0.05992949471210341,0.06092462518117112,-0.613869665517935,0.5430255402750491,0.639752445827121,0.0,0.0,0.0,0.0,
3-
1,2020.0,1,-0.2659197918000082,0.21669180492709905,0.059320659210062375,-0.5988444469664678,0.5094559030540424,0.6494882472052341,0.0,0.0,0.0,0.0,
4-
1,2021.0,1,-0.25543875103684177,0.1679144385026738,0.0570746110314559,-0.5821259283872153,0.4567660910518053,0.6444373367775469,0.0,0.0,0.0,0.0,
5-
1,2022.0,1,-0.24930347300809638,0.1702127659574468,0.05798520015481514,-0.584760268520426,0.4185291547009614,0.6442540414107724,0.0,0.0,0.0,0.0,
3+
1,2020.0,1,-0.2659197918000082,0.21649484536082475,0.059320659210062375,-0.5988444469664678,0.5077054794520548,0.6494882472052341,0.0,0.0,0.0,0.0,
4+
1,2021.0,1,-0.25543875103684177,0.17154255319148937,0.0570746110314559,-0.5821259283872153,0.4546365914786967,0.6444373367775469,0.0,0.0,0.0,0.0,
5+
1,2022.0,1,-0.24930347300809638,0.17119275825346114,0.05798520015481514,-0.584760268520426,0.41575984990619136,0.6442540414107724,0.0,0.0,0.0,0.0,
66
2,2019.0,1,-0.279462622342386,0.059964726631393295,0.06092462518117112,-0.613869665517935,0.542454991816694,0.639752445827121,0.0,0.0,0.0,0.0,
7-
2,2020.0,1,-0.2659197918000082,0.21601208459214502,0.059320659210062375,-0.5988444469664678,0.5093243656374198,0.6494882472052341,0.0,0.0,0.0,0.0,
8-
2,2021.0,1,-0.25543875103684177,0.16545796400752083,0.0570746110314559,-0.5821259283872153,0.45847217856020117,0.6444373367775469,0.0,0.0,0.0,0.0,
9-
2,2022.0,1,-0.24930347300809638,0.17013333333333333,0.05798520015481514,-0.584760268520426,0.42144108081060794,0.6442540414107724,0.0,0.0,0.0,0.0,
7+
2,2020.0,1,-0.2659197918000082,0.2158490566037736,0.059320659210062375,-0.5988444469664678,0.5075868820362213,0.6494882472052341,0.0,0.0,0.0,0.0,
8+
2,2021.0,1,-0.25543875103684177,0.1670235546038544,0.0570746110314559,-0.5821259283872153,0.45493400377121307,0.6444373367775469,0.0,0.0,0.0,0.0,
9+
2,2022.0,1,-0.24930347300809638,0.16631186801490155,0.05798520015481514,-0.584760268520426,0.42149276085871196,0.6442540414107724,0.0,0.0,0.0,0.0,

0 commit comments

Comments
 (0)