Skip to content

Commit 07ef062

Browse files
igelstormigelstorm
committed
fixup! Update expected output for integration test
1 parent a9e3a99 commit 07ef062

4 files changed

Lines changed: 28 additions & 24 deletions

File tree

‎src/test/java/simpaths/integrationtest/expected/.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.csv text eol=lf

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
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,
2-
1,2019.0,1,15875.360553295523,0.0,0.0,572.7015922586642,1248.2827754083432,1868.273470162789,2909.844748548787,15875.360553295523,NaN,4.578523387949914,7.22253235232603,7.93520982557409,8.432186186831146,
3-
1,2020.0,1,15345.626380486061,0.0,0.0,447.4238448565247,1192.6373426203575,1860.3540603575398,2889.370230257769,15348.0373334674,NaN,4.398914087037572,7.161209610561701,7.89341460857302,8.405930909027763,
4-
1,2021.0,1,14899.970203186678,0.0,0.0,376.2779789704161,1162.2266450696948,1866.428819133287,2917.847874188074,14899.781606682765,NaN,4.052457565118724,7.083216666966138,7.878626903561942,8.416332273087466,
5-
1,2022.0,1,14628.405095840735,0.0,0.0,303.22825882928,1149.9971680201347,1820.7409706324966,2842.8374938266984,14628.405095840735,NaN,3.7441676118098814,6.989957497880787,7.851835576704947,8.389873866692882,
6-
2,2019.0,1,15873.788716455236,0.0,0.0,572.2432767532691,1248.1061927255917,1868.190254860854,2909.689173751418,15873.788716455236,NaN,4.5786171507444475,7.224670734817771,7.934994015604467,8.431997978220402,
7-
2,2020.0,1,15378.65888263112,0.0,0.0,466.2902247746595,1197.7308105516627,1860.408013859396,2891.115521394317,15385.580829982362,NaN,4.442727227295819,7.161349872148203,7.8925841056466295,8.404719912750444,
8-
2,2021.0,1,14924.040877407799,0.0,0.0,378.35895165328515,1173.2290865569876,1866.6993583011586,2895.6541389680556,14924.040877407799,NaN,4.003236903163803,7.088364858294911,7.879321567558003,8.416691036219818,
9-
2,2022.0,1,14572.14115492997,0.0,0.0,287.7984859683699,1137.295980301634,1808.503360326703,2836.00638736231,14572.14115492997,NaN,3.831492397598505,6.9993172777276875,7.8475019070905665,8.385970902195222,
2+
1,2011.0,1,15003.457557291145,0.0,0.0,514.8453548701509,1201.7095532707438,1843.8692469891062,2791.550350079213,15003.457557291145,NaN,3.7030532182021063,7.056417846107403,7.840112269698154,8.364711960909476,
3+
1,2012.0,1,14454.6918614987,0.0,0.0,393.28122998145227,1103.988359942994,1755.7153730875202,2710.289051880879,14454.6918614987,NaN,4.013681928056481,7.026543635576518,7.80385278971383,8.333781834472386,
4+
1,2013.0,1,14409.423083043284,0.0,0.0,335.27551105622456,1057.3903524583097,1708.545211695145,2661.1266480978366,14409.423083043284,NaN,3.9322637009856987,6.963300772152232,7.757398673104069,8.30668567576837,
5+
1,2014.0,1,13931.47754763305,0.0,0.0,299.00126875985336,1027.900459004978,1678.2472520345248,2611.5290584813865,13931.47754763305,NaN,3.8093721214916583,6.885490369504817,7.724447921632903,8.286872204920714,
6+
1,2015.0,1,13889.899745176157,0.0,0.0,219.38955747635873,1010.2726680052735,1661.362712925204,2631.9725603372885,13889.752311402248,83.56987816470495,3.5837980086293437,6.847206631210186,7.71779420710016,8.28612115398404,
7+
1,2016.0,1,14494.474999501212,0.0,0.0,217.52795540015222,1017.5846104552195,1669.0413532035493,2662.072066024444,14494.34355329584,105.11928260660115,3.6403721554005535,6.794223358231705,7.708492007052548,8.293430665516675,
8+
1,2017.0,1,14502.269171476368,0.0,0.0,221.24578184545513,1026.2621424550755,1685.2949246007909,2662.6476150345766,14502.105253367246,106.9823852921849,3.5059834715172866,6.766055187422331,7.70258997954176,8.293372819246446,
9+
1,2018.0,1,14615.029565244815,0.0,0.0,167.22875873998652,1015.4981178405949,1679.2846691566958,2661.984661439668,14623.056932163614,106.91199124928946,3.3165765832104435,6.723997546742468,7.6819395552606,8.280875426510493,
10+
1,2019.0,1,14364.328301636773,0.0,0.0,197.70672948668025,1038.2998994593563,1709.1306058269643,2696.9066046685425,14364.328301636773,107.06517135504883,3.3186983388481965,6.723693082075522,7.709020504941113,8.30357802573937,

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
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,
2-
1,2019.0,1,0.403300267160158,33.71382836251314,-398.8370733618408,-351.1079542798109,-720.2053324304946,-1107.8783294335205,-1342.9553883534224,-1403.8601881882912,-0.03416156852425184,-0.019158751359294623,-0.024628482008368202,0.07273615294117652,0.2511179910560716,0.9580040291337363,0.07952941176470588,0.5737874097007224,0.6438865643886564,0.23129411764705882,0.11764705882352941,0.17619711761971177,0.09482352941176471,1319.9260497910843,1700.6838453881592,1727.7376403630462,3.7413140694874443,3.458546412521308,3.1108235294117645,0.0,0.0,0.0,0.0,0.0,0.0,409.12552514711075,521.3014851971043,468.57963722480764,0.0,0.0,0.0,2907.0,6453.0,4250.0,0.02304781561747506,0.03781187044785371,0.05341176470588235,0.22359821121431028,0.6694560669456067,0.6148235294117647,0.0,0.0,0.0,
3-
1,2020.0,1,4.894120444391318,23.10198001225922,-453.2190472970283,-453.68432654311505,-720.1695814395458,-1107.8550352405018,-1342.944837485266,-1403.8177540151999,-0.00487045421016008,-0.006078043196733274,-0.011562343859649132,0.06997309986181488,0.30654140570633265,1.0132348414896892,0.10041455550437586,0.523312456506611,0.62357648507233,0.22409028097650852,0.13883089770354906,0.18344105878731917,0.10479041916167664,1309.3142014408304,1646.3018714529717,1625.161268099742,3.583159359777314,3.388581101877501,3.1121602947950255,0.0,0.0,0.0,0.0,0.0,0.0,426.2964901430277,516.1703610963518,465.57348969208164,0.0,0.0,0.0,2874.0,6498.0,4342.0,0.018789144050104383,0.02754693751923669,0.051128512206356516,0.28357689631176064,0.7883964296706679,0.7759097190234915,0.0,0.0,0.0,
4-
1,2021.0,1,-0.8152635931164193,-6.180984960965134,-471.5247029036195,-491.6502819589907,-720.1536973552134,-1107.895850409372,-1343.0209375334045,-1403.8033976396637,0.004559171727562983,0.007912896694579119,0.00799820907100407,0.07006488838900249,0.30046115643845334,0.9862370972786988,0.10679391047489208,0.4937921248669741,0.6015014075695965,0.2149511474664849,0.15892160340546294,0.18595558335939943,0.1138377641445126,1280.031236467606,1627.9962158463804,1587.1953126838664,3.389499822632139,3.2599311854863937,3.002044989775051,0.0,0.0,0.0,0.0,0.0,0.0,433.2546022663905,529.5644621631168,467.6922772937242,0.0,0.0,0.0,2819.0,6394.0,4401.0,0.021284143313231644,0.032843290584923364,0.06907521017950466,0.2600212841433132,0.8026274632467939,0.7916382640309021,0.0,0.0,0.0,
5-
1,2022.0,1,4.726054649594156,-34.04259703366233,-508.8228003786621,-523.1531636155555,-720.1601642671012,-1107.8813266173609,-1342.993758592142,-1403.7485376550321,0.01307946547829153,0.01058240007311545,0.01304274863813229,0.0657467622086445,0.2957995058242146,0.9835019455252918,0.11360036207286717,0.4839392869749382,0.5853696498054475,0.2172437202987101,0.1602541475467702,0.19704280155642023,0.11586331749264539,1252.1696243949089,1590.6981183713378,1555.6924310273016,3.2488528062124957,3.1975097276264592,2.9264539488572074,0.0,0.0,0.0,0.0,0.0,0.0,425.90429284001715,521.0391886625475,477.90018506206616,0.0,0.0,0.0,2833.0,6425.0,4419.0,0.030003529827038473,0.03782101167315175,0.0864448970355284,0.24638192728556302,0.8144747081712063,0.8040280606472052,0.0,0.0,0.0,
6-
2,2019.0,1,0.40497872478091845,32.98596199153212,-397.8354221076495,-353.77807675207396,-720.205280205579,-1107.8781782410917,-1342.9552827718626,-1403.8587161911869,-0.03405538630419824,-0.018950898472385402,-0.024346473380849082,0.07249101804511282,0.25120440467997246,0.9584753641152773,0.08012218045112782,0.5736407432897453,0.6431670281995662,0.231203007518797,0.11768754301445286,0.1766346451812829,0.09515977443609022,1319.1981834201033,1701.6854966423505,1725.0675178907832,3.740880935994494,3.460024790827394,3.112077067669173,0.0,0.0,0.0,0.0,0.0,0.0,408.8318384418148,521.7096331072603,467.11678163758256,0.0,0.0,0.0,2906.0,6454.0,4256.0,0.023055746730901584,0.038115897118066316,0.0531015037593985,0.2236751548520303,0.6684226836070654,0.6156015037593985,0.0,0.0,0.0,
7-
2,2020.0,1,-0.26262105216675113,24.71467395450827,-456.46008220947306,-454.5529615619048,-720.1665665904206,-1107.859947192459,-1342.9537563848814,-1403.8222301596454,-0.005562349042145587,-0.006747063948466414,-0.01364837640501626,0.07052316042484419,0.3019853709508882,1.0219848273726584,0.10020780420226276,0.5235109717868338,0.62532899829695,0.22442853844377741,0.13932427725531174,0.18377457810806627,0.10390210113137843,1310.9268953830795,1643.060836540527,1624.2926330809523,3.5806339254615116,3.3876761108530733,3.107827291618564,0.0,0.0,0.0,0.0,0.0,0.0,425.7228831350267,514.5907502472991,464.4206870261194,0.0,0.0,0.0,2871.0,6459.0,4331.0,0.019157088122605363,0.02724880012385818,0.051720157007619484,0.2831765935214211,0.7906796717758167,0.779496652043408,0.0,0.0,0.0,
8-
2,2021.0,1,0.5970613472251771,-2.343483867707846,-474.5227079162637,-504.3193914591236,-720.1496194125542,-1107.8971447875647,-1343.0256392753656,-1403.8076663758827,0.003508695454545463,0.007243033049103231,0.006747036096340309,0.07090659927173426,0.29651988636363635,0.9912417891773537,0.10559854346836596,0.49467329545454547,0.6044729433844229,0.21506599908966773,0.1590909090909091,0.1842352205192368,0.11288120163859809,1283.8687375608633,1624.9982108337363,1574.5262031837335,3.3735795454545454,3.262433531435721,2.9931725079654075,0.0,0.0,0.0,0.0,0.0,0.0,430.2871765085754,530.3871095166861,470.33698027728025,0.0,0.0,0.0,2816.0,6394.0,4394.0,0.02166193181818182,0.03159211761025962,0.06941283568502503,0.26029829545454547,0.8048170159524555,0.7899408284023669,0.0,0.0,0.0,
9-
2,2022.0,1,1.05957685482171,-29.294978137885437,-526.24265437493,-536.1031622150447,-720.1611183015307,-1107.8832876920949,-1342.9966603582152,-1403.7502043431823,0.008490690328273931,0.009670894850631828,0.013069365890027967,0.066274614479638,0.2954465231203671,0.9900590245417832,0.11199095022624435,0.48746911401341336,0.5831003417210314,0.2171945701357466,0.16131309565831276,0.19928549238894067,0.11538461538461539,1256.9172432906857,1573.27826437507,1542.7424324278124,3.2492057889163433,3.206741223982603,2.9160633484162894,0.0,0.0,0.0,0.0,0.0,0.0,424.35122708105166,518.0878053404592,477.11131001812316,0.0,0.0,0.0,2833.0,6438.0,4420.0,0.030003529827038473,0.035414725069897485,0.08484162895927602,0.24567596187786797,0.8157812985399192,0.8038461538461539,0.0,0.0,0.0,
2+
1,2011.0,1,1.4607581846032642,-93.8478738125857,-405.84396636942597,-475.4942240291314,-720.1130080873596,-1107.9479500804218,-1343.1187593756931,-1403.935901657333,0.015550962820673253,6.122377823408742E-4,-0.014200705093548954,0.11810355320829224,0.38067826304592667,0.9000767278522104,0.057847976307996055,0.5034413715429858,0.6347164020539455,0.19358341559723594,0.1382805656363409,0.17493950303960337,0.08716683119447187,1192.3643476159855,1693.676952380574,1603.3513706137257,3.8177950193968213,3.612288260638612,3.2145113524185587,0.0,0.0,0.0,0.0,0.0,0.0,360.1191897350455,517.0439202521421,465.52814854650194,0.0,0.0,0.0,7991.0,16943.0,10130.0,0.013390063821799525,0.05105353243227292,0.05409674234945706,0.3286196971593042,0.6843534202915659,0.6658440276406713,0.0,0.0,0.0,
3+
1,2012.0,1,-0.8178339893663649,-57.551295452493605,-472.96279792398605,-546.1453742095382,-720.0796625203407,-1107.9328842914176,-1343.1151808051918,-1403.8807752582454,0.027028144755244732,0.011035015981928575,-0.002672359976594485,0.12251377867597169,0.42045454545454547,0.9593914569923933,0.06309973829601628,0.4742757242757243,0.6152135751901697,0.17747407192013182,0.15596903096903098,0.18291398478642482,0.09886594940389648,1228.6609259760776,1626.558120826014,1532.700220433319,3.7492507492507494,3.5920421299005265,3.24212464863817,0.0,0.0,0.0,0.0,0.0,0.0,371.78769181576115,501.18369280597983,437.9169107342736,0.0,0.0,0.0,8008.0,17090.0,10317.0,0.008116883116883116,0.03136337039204213,0.04671900746340991,0.36126373626373626,0.8051492100643651,0.799360279150916,0.0,0.0,0.0,
4+
1,2013.0,1,-0.9280189898055886,-22.059329281402142,-510.3949991166148,-561.6209830597634,-720.0438889601427,-1107.9073909069532,-1343.095994886795,-1403.8296895042274,0.023656516383616377,0.01737553311989215,0.008524044807467906,0.12473581548905255,0.4155844155844156,0.9644690781796966,0.06568505593268954,0.4682817182817183,0.5927654609101517,0.16932785161105268,0.16533466533466534,0.1941656942823804,0.10479013289989483,1264.152892147169,1589.1259196333851,1517.2246115830937,3.6344905094905093,3.506126021003501,3.173725977626924,0.0,0.0,0.0,0.0,0.0,0.0,379.96939054142325,485.4245468919287,424.31376162940825,0.0,0.0,0.0,8008.0,17140.0,10459.0,0.014735264735264736,0.031096849474912487,0.06931829046753991,0.3345404595404595,0.823512252042007,0.8004589348886126,0.0,0.0,0.0,
5+
1,2014.0,1,-0.5492578088785776,-40.97026446120344,-536.6248594020817,-631.3523884766937,-720.0703794892088,-1107.926123233922,-1343.110683659988,-1403.810960591115,0.03128519148375769,0.025086968287360845,0.014372858035922559,0.1304302705882353,0.3979681424808729,0.9643690226265453,0.06108235294117647,0.45792048162548604,0.5811173314672265,0.1632941176470588,0.16806722689075632,0.19996501049685095,0.10512941176470589,1245.2419569673677,1562.8960593479183,1447.4932061661634,3.5605167440110375,3.432528574760905,3.107105882352941,0.0,0.0,0.0,0.0,0.0,0.0,374.5695978361896,476.9816776556532,419.2269938782026,0.0,0.0,0.0,7973.0,17148.0,10625.0,0.018562648940173083,0.030207604385351063,0.08282352941176471,0.29900915590116645,0.8269769069279216,0.7978352941176471,0.0,0.0,0.0,
6+
1,2015.0,1,-1.0514565045329625,-29.231438958556964,-566.9961927687516,-610.1625749091056,-720.0917353555504,-1107.9344734759236,-1343.1117846100944,-1403.8023315874564,0.0274861967444181,0.03476903440146106,0.033536662624392505,0.13106751228199687,0.38605463390295625,0.972170793797732,0.06293254590753898,0.45865036796806785,0.5699490858597547,0.1623142936236966,0.17113633528751404,0.19196945151585282,0.10547199409430655,1256.9807824700142,1532.5247259812484,1468.6830197337515,3.5003118373456403,3.3723096505438557,3.062932545907539,0.0,0.0,0.0,0.0,0.0,0.0,380.0705493800171,477.22329372361423,433.5758217024542,0.0,0.0,0.0,8017.0,17284.0,10837.0,0.022826493700885617,0.03268919231659338,0.0948602011626834,0.2767868279905201,0.8264869243230734,0.8045584571375842,0.0,0.0,0.0,
7+
1,2016.0,1,-0.21868030596424903,-6.785755066830916,-543.6939867821914,-561.692856939025,-720.1084293605625,-1107.932799111552,-1343.0994930444585,-1403.785491222721,0.01419329367135913,0.03681707807183887,0.040993235002599215,0.1302740951027429,0.36813255263485734,0.9822676601397794,0.0635466642527383,0.465304596985175,0.558597585629296,0.16728523581062732,0.1777750093434658,0.19586437936810489,0.10129446908662985,1279.4264663617403,1555.8269319678086,1517.1527377038321,3.4448735517628006,3.326690925893837,3.026160948673848,0.0,0.0,0.0,0.0,0.0,0.0,382.2119592365975,489.5675864865224,446.34249300288,0.0,0.0,0.0,8027.0,17313.0,11047.0,0.026535442880279057,0.03540691965575001,0.0974925319091156,0.2580042357044973,0.8264310056027263,0.8050149361817688,0.0,0.0,0.0,
8+
1,2017.0,1,-1.033155773561436,16.671186825594305,-535.9108658124935,-600.2540088650007,-720.1146356938414,-1107.9293170676378,-1343.0910273576517,-1403.7639909450854,0.009971550674662655,0.039118395002867234,0.04513841621932957,0.1291958701910263,0.35069965017491256,0.995507430019583,0.06850288760550867,0.4723888055972014,0.5552931689897477,0.1697912039093736,0.17491254372813594,0.1950236147909227,0.09986672589960018,1302.8834082541655,1563.6100529375065,1478.5915857778564,3.397176411794103,3.2841838497868907,2.9773434029320303,0.0,0.0,0.0,0.0,0.0,0.0,391.52778563489295,494.59059419035657,450.8643373262316,0.0,0.0,0.0,8004.0,17362.0,11255.0,0.028360819590204898,0.03795645662942057,0.09826743669480231,0.2426286856571714,0.8248473678147679,0.8032874278098623,0.0,0.0,0.0,
9+
1,2018.0,1,-1.2211545442498943,43.74571408227598,-519.0728281716868,-622.8238909345005,-720.1383936098788,-1107.976226011954,-1343.151770669336,-1403.7621826365591,0.01393119145728644,0.04613939129961936,0.056382276144467475,0.12724778180545837,0.3257537688442211,1.0134575569358177,0.06945416375087474,0.47311557788944725,0.5421555095468139,0.16672498250524842,0.17022613065326633,0.19691741430871865,0.10488103568929322,1329.9579355108472,1580.4480905783132,1456.0217037083567,3.3545226130653267,3.238382792730619,2.942617214835549,0.0,0.0,0.0,0.0,0.0,0.0,398.0761551499063,494.9084703063349,450.5832698252075,0.0,0.0,0.0,7960.0,17388.0,11432.0,0.032035175879396985,0.0399700943179204,0.10365640307907628,0.23454773869346734,0.822463768115942,0.8078201539538139,0.0,0.0,0.0,
10+
1,2019.0,1,-0.3671121779858678,74.7309905858026,-534.4747312176146,-618.6275447340429,-720.1416160432663,-1107.953267469416,-1343.1148654724818,-1403.739748951645,0.009089585656412213,0.04189005132024376,0.0547485065211146,0.11445486703381813,0.3044689201164704,1.0302212008043665,0.07073401600550727,0.4804405620964679,0.5420281528296467,0.1744256088116341,0.16774275224711988,0.19867854064923873,0.1099733241545478,1360.9432120143738,1565.0461875323854,1460.2180499088142,3.3270034181541965,3.2102844010341856,2.916358316840203,0.0,0.0,0.0,0.0,0.0,0.0,406.53460480618725,499.535135289749,451.92428059466386,0.0,0.0,0.0,7899.0,17405.0,11621.0,0.038612482592733255,0.04119505889112324,0.1002495482316496,0.22939612609191037,0.8234989945417983,0.8150761552362104,0.0,0.0,0.0,

0 commit comments

Comments
 (0)