Skip to content

Commit 73ea1d5

Browse files
andrewbaxter439andrewbaxter439
committed
update statistics #257 
1 parent 3fd5996 commit 73ea1d5

3 files changed

Lines changed: 27 additions & 27 deletions

File tree

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@ run,time,id_HealthStatistics1,N,dhe_mcs_mean,dhe_mcs_median,dhe_mcs_p_10,dhe_mcs
22
1,2019.0,1,11901,47.61009495000377,49.97,33.0,42.31,54.79,57.73,51.79902781278939,54.89,38.22,48.864999999999995,57.76,60.05,11.458700949500042,10.0,6.0,8.0,13.0,19.0,5.109486597764894,6.0,3.0,4.0,6.0,6.0,Total,9959.214461392088,95555.42857142857,
33
1,2019.0,1,5857,48.734925729896126,51.0,34.77,44.379999999999995,55.34,58.15,52.17924364008878,55.0,40.3,49.41,57.57,59.72,10.857094075465255,10.0,6.0,7.0,12.0,18.0,5.113027147003585,5.0,3.0,5.0,6.0,6.0,Male,4994.497379400034,47059.57142857143,
44
1,2019.0,1,6044,46.52006618133682,48.87,31.43,40.61,54.37,57.33,51.43057577763053,54.8,36.58,48.0,57.76,60.41,12.041694242223693,11.0,6.0,8.0,14.0,21.0,5.106055592322965,6.0,3.0,4.0,6.0,7.0,Female,4964.717081992105,48495.857142857145,
5-
1,2020.0,1,12826,46.9432924856815,48.366526371419326,37.93351582332674,43.700856385107784,51.46846463525187,53.54584219181414,52.00815650009351,54.43150179441825,41.95341119318125,49.55103351988515,56.851427331649305,58.22572469060568,11.838740700289625,11.495894404330068,4.927165859963634,8.002354442893825,15.334961692954918,19.074488722118698,5.122797442694527,5.0,4.0,5.0,6.0,6.0,Total,10784.276249541363,103250.71428571429,
6-
1,2020.0,1,6202,48.043384018691334,49.277177202247614,39.64908693285845,45.40199133535671,52.0933498993683,54.08600993811607,52.45266262842583,54.57417784553519,43.58739220948566,50.2309801241524,56.95461381317418,58.324747349652014,11.171397872755554,10.902106220597087,4.404458643221568,7.511460708314802,14.625344686832383,18.045983780920764,5.103192518542405,5.0,4.0,5.0,6.0,6.0,Male,5316.573547613404,49735.71428571428,
7-
1,2020.0,1,6624,45.91328528644726,47.31065132517311,36.70075188646388,42.37598271413436,50.79204455374422,52.844164213341614,51.59196884793264,54.246743414889664,40.60616981501177,48.82530016641519,56.7944423495926,58.152958301465056,12.463568631504407,12.083186551769758,5.470447717489775,8.538913442065123,16.026267170271204,20.08588485220175,5.141153381642512,5.0,4.0,5.0,6.0,6.0,Female,5467.702701927918,53515.0,
8-
1,2021.0,1,12392,46.373649960670356,47.162648029370054,40.15722611850441,43.94650500198553,49.52223400146926,51.36306228601121,51.757733155970406,53.45363841970169,43.55595530641323,49.5976991821336,55.85009902478853,57.445098057179784,12.039563267512213,11.922223801831613,4.996183972070412,8.265255394793032,15.668991416985094,19.108550664977862,5.097482246610717,5.0,4.0,5.0,5.0,6.0,Total,10338.885702955706,99264.0,
9-
1,2021.0,1,6005,47.380810960854554,48.24699627863947,41.39497227279515,45.1270607981105,50.29923457877511,51.98534550312183,52.333887598207376,53.78680611612318,45.129465807396855,50.282005721122715,56.201342030188414,57.68165349222692,11.403353520023769,11.30461082427523,4.47948746945611,7.708390148038262,14.924593458325205,18.33102309423582,5.054454621149042,5.0,4.0,5.0,5.0,6.0,Male,5114.130880098713,47696.0,
10-
1,2021.0,1,6387,45.426726239658095,46.21736527903425,39.089670161182525,42.99167430701094,48.6215609317415,50.42872561865636,51.21603792728164,53.10583754674186,42.31343450294979,48.70188162066195,55.520661125259046,57.19985511848179,12.637721954480801,12.571414488338235,5.401764638277565,8.729389213207627,16.353742068073117,19.94423496664796,5.137936433380304,5.0,4.0,5.0,6.0,6.0,Female,5224.754822856987,51568.0,
11-
1,2022.0,1,12447,45.90676760646228,46.3420299563685,41.029642766075995,43.77444723246026,48.51127449943578,50.13649986220413,51.57020351429136,52.775258975815916,44.60374329968826,49.29494555452378,55.23642544795763,56.95156371770119,12.184401070908189,12.121581349891834,5.079431957225332,8.44608746945596,15.79175132754164,19.253088127481973,5.059532417449988,5.0,4.0,5.0,5.0,6.0,Total,10307.553325556004,98962.28571428571,
12-
1,2022.0,1,6032,46.8763771531296,47.436118444198804,41.944737766295354,44.95322193457366,49.34033983355798,50.816703493361196,52.20881438514568,53.25194503012069,45.911028930977274,50.18256463511359,55.61806740141252,57.28898140313048,11.472637370845277,11.431670687445461,4.540769476754584,7.7388506569687685,14.99987216746992,18.498973593950495,5.011770557029178,5.0,4.0,5.0,5.0,6.0,Male,5102.366803244574,47505.857142857145,
13-
1,2022.0,1,6415,44.995047452838655,45.34566508666595,40.284244741388044,42.89772758233755,47.49306798420158,49.15863931952595,50.96972015139203,52.24254806086533,43.55011778864991,48.48639407799905,54.776720709815926,56.50172675444915,12.853669759728128,12.779833274245965,5.7305470643156555,9.158332338751237,16.531646995273178,19.95342194184516,5.104442712392829,5.0,4.0,5.0,5.0,6.0,Female,5205.186522311398,51456.42857142857,
5+
1,2020.0,1,12826,46.943292526866514,48.366526371419326,37.93351582332674,43.700856385107784,51.46846463525187,53.54584219181414,52.00815555855841,54.43150179441825,41.95341119318125,49.55103351988515,56.851427331649305,58.22572469060568,11.838740357000832,11.495894404330068,4.927165859963634,8.002354442893825,15.334961692954918,19.074488722118698,5.122797442694527,5.0,4.0,5.0,6.0,6.0,Total,10784.27611117098,103250.71428571429,
6+
1,2020.0,1,6202,48.0433841060167,49.277177202247614,39.64908693285845,45.40199133535671,52.0933498993683,54.08600993811607,52.452660680437305,54.57417784553519,43.58739220948566,50.2309801241524,56.95461381317418,58.324747349652014,11.171397233633023,10.902106220597087,4.404458643221568,7.511460708314802,14.625344686832383,18.045983780920764,5.103192518542405,5.0,4.0,5.0,6.0,6.0,Male,5316.573411839523,49735.71428571428,
7+
1,2020.0,1,6624,45.91328528443138,47.31065132517311,36.70075188646388,42.37598271413436,50.79204455374422,52.844164213341614,51.591968848732066,54.246743414889664,40.60616981501177,48.82530016641519,56.7944423495926,58.152958301465056,12.463568565202456,12.083186551769758,5.470447717489775,8.538913442065123,16.026267170271204,20.08588485220175,5.141153381642512,5.0,4.0,5.0,6.0,6.0,Female,5467.702699331416,53515.0,
8+
1,2021.0,1,12392,46.3736498265545,47.162648029370054,40.15722611850441,43.94650500198553,49.52223400146926,51.36306228601121,51.757732460312006,53.45363841970169,43.55595530641323,49.5976991821336,55.85009902478853,57.445098057179784,12.039563067153107,11.922223801831613,4.996183972070412,8.265255394793032,15.668991416985094,19.108550664977862,5.097482246610717,5.0,4.0,5.0,5.0,6.0,Total,10338.88558424085,99264.0,
9+
1,2021.0,1,6005,47.38081077505444,48.24699627863947,41.39497227279515,45.1270607981105,50.29923457877511,51.98534550312183,52.33388612864798,53.78680611612318,45.129465807396855,50.282005721122715,56.201342030188414,57.68165349222692,11.403353246315067,11.30461082427523,4.47948746945611,7.708390148038262,14.924593458325205,18.33102309423582,5.054454621149042,5.0,4.0,5.0,5.0,6.0,Male,5114.1307597079585,47696.0,
10+
1,2021.0,1,6387,45.42672615413522,46.21736527903425,39.089670161182525,42.99167430701094,48.6215609317415,50.42872561865636,51.21603795923798,53.10583754674186,42.31343450294979,48.70188162066195,55.520661125259046,57.199856421469796,12.63772182308433,12.571414488338235,5.401764638277565,8.729389213207627,16.353742068073117,19.94423496664796,5.137936433380304,5.0,4.0,5.0,6.0,6.0,Female,5224.75482453289,51568.0,
11+
1,2022.0,1,12447,45.9067684825106,46.3420299563685,41.029642766075995,43.77444723246026,48.51127449943578,50.13649986220413,51.57020201108495,52.775258975815916,44.60374329968826,49.29494555452378,55.23642544795763,56.95156371770119,12.184400055737559,12.121581349891834,5.079431957225332,8.44608746945596,15.79175132754164,19.253088127481973,5.059532417449988,5.0,4.0,5.0,5.0,6.0,Total,10307.55318038355,98962.28571428571,
12+
1,2022.0,1,6032,46.876376927486696,47.436118444198804,41.944737766295354,44.95322193457366,49.34033983355798,50.816703493361196,52.20881209320616,53.25194503012069,45.911028930977274,50.18256463511359,55.61806740141252,57.28898140313048,11.472636899376502,11.431670687445461,4.540769476754584,7.7388506569687685,14.99987216746992,18.498973593950495,5.011770557029178,5.0,4.0,5.0,5.0,6.0,Male,5102.366612771909,47505.857142857145,
13+
1,2022.0,1,6415,44.995049364803116,45.34566508666595,40.284244741388044,42.89774401061289,47.49306798420158,49.15863931952595,50.9697193898283,52.24254806086533,43.55011778864991,48.48639407799905,54.776720709815926,56.50172675444915,12.853668233316698,12.779833274245965,5.7305470643156555,9.158332338751237,16.531646995273178,19.95342194184516,5.104442712392829,5.0,4.0,5.0,5.0,6.0,Female,5205.186567611601,51456.42857142857,
1414
2,2019.0,1,11907,47.586078777189414,49.98,32.967999999999996,42.22,54.79,57.73,51.81769379356735,54.98,38.227999999999994,48.88,57.76,60.08200000000001,11.467120181405896,10.0,6.0,8.0,13.0,19.0,5.107835726883346,6.0,3.0,4.0,6.0,6.0,Total,9964.58653657535,95572.71428571429,
1515
2,2019.0,1,5862,48.71830433299245,51.0,34.659,44.3575,55.3,58.15,52.20262538382805,55.0,40.415000000000006,49.45,57.58,59.72,10.861821903787103,10.0,6.0,7.0,12.0,18.0,5.1132719208461275,5.0,3.0,5.0,6.0,6.0,Male,4999.899852778956,47102.0,
1616
2,2019.0,1,6045,46.488129032257966,48.87,31.318,40.53,54.37,57.33,51.444415219189246,54.8,36.58,48.0,57.76,60.42,12.05409429280397,11.0,6.0,8.0,14.0,21.0,5.102564102564102,6.0,3.0,4.0,6.0,7.0,Female,4964.686683796456,48470.71428571428,
17-
2,2020.0,1,12845,46.894390698019805,48.350554865080625,37.828872274266644,43.62805356928378,51.459560516858545,53.51683435066312,52.02370312397232,54.433601869152156,42.07550869519429,49.564212064271345,56.82872756212411,58.210407079329464,11.824140533435523,11.467245016055564,4.926927068952009,7.978090824769531,15.329544833125995,19.09122294515114,5.121136629038537,5.0,4.0,5.0,6.0,6.0,Total,10796.769671056114,103370.14285714286,
18-
2,2020.0,1,6224,47.96899408868534,49.18402098554201,39.43858198765237,45.293284485567774,52.07394297312881,54.045384576849315,52.46957377597142,54.57906838055987,43.81012620762393,50.21954392130845,56.92039773670731,58.311158811958315,11.185118156298437,10.927660466221665,4.44708704895973,7.514005676596507,14.614312897317667,18.029534764177356,5.100739074550129,5.0,4.0,5.0,6.0,6.0,Male,5332.225485036147,49888.142857142855,
19-
2,2020.0,1,6621,45.8842213122011,47.332310886620654,36.587789444728934,42.29380442906302,50.76583433342208,52.849478871806284,51.604567202202645,54.250672045062565,40.616082800853974,48.83815864738823,56.77147987940553,58.118184740187296,12.424846661709458,12.018705697962497,5.3708913149072846,8.484208247667068,16.01820735564978,20.082233001931503,5.140311131249056,5.0,4.0,5.0,6.0,6.0,Female,5464.544186019895,53482.0,
20-
2,2021.0,1,12377,46.37552146752613,47.15568126202504,40.11917374836849,43.95911212778073,49.52213980184484,51.35953139988363,51.78693069635783,53.463401311629575,43.71027120349299,49.62056456027415,55.84278197105513,57.42085511065392,12.024720529899957,11.915797307189411,4.91834336453621,8.257742334829466,15.656637289305742,19.107541363081005,5.102044114082572,5.0,4.0,5.0,6.0,6.0,Total,10331.367119104387,99232.57142857142,
21-
2,2021.0,1,6007,47.35320586388497,48.21783558004387,41.39476992099278,45.1270607981105,50.29597546987339,51.99441094529906,52.34174800213515,53.791301515286406,45.25409167930417,50.281444671690004,56.192768799796916,57.66258565937774,11.433403216904903,11.313378598121375,4.62556667152762,7.792629366412121,14.953314619405578,18.307986046798455,5.05410354586316,5.0,4.0,5.0,5.0,6.0,Male,5114.592766830238,47708.57142857143,
22-
2,2021.0,1,6370,45.45355126832252,46.253580404415615,39.09479084880615,43.039460070312394,48.61516702864053,50.42904590395287,51.26373013814687,53.147274101291124,42.548802053394986,48.823671543610885,55.522269909732614,57.18430303887879,12.582341110615983,12.532152785088485,5.249683641766505,8.670952741531945,16.34757901397839,19.92761493142018,5.147252747252748,5.0,4.0,5.0,6.0,6.0,Female,5216.7743522740875,51524.0,
23-
2,2022.0,1,12415,45.930278574211904,46.35968102663099,41.026642644299876,43.84286743019593,48.50239659443895,50.161266104215294,51.61101054409273,52.80887402649098,44.68976598431965,49.37283544472107,55.24758118595533,56.94241478048266,12.123248765643083,12.088632888884675,5.099994929636303,8.396241666322098,15.704133277945056,19.120553425952902,5.06532420459122,5.0,4.0,5.0,5.0,6.0,Total,10290.984026774939,98820.85714285714,
24-
2,2022.0,1,6007,46.877748935140964,47.426879878544554,41.89304724419556,44.97416752794771,49.34749615875357,50.837276881550935,52.22211756400231,53.2559067206558,45.97057986000124,50.174110959454616,55.63566775323229,57.28508864243988,11.468495589977396,11.480018723018494,4.553972133927307,7.773018470963829,14.95689309144465,18.265215460120576,5.0114865989678705,5.0,4.0,5.0,5.0,6.0,Male,5082.461756648935,47306.28571428571,
25-
2,2022.0,1,6408,45.04209903955202,45.42457458812706,40.37118048224564,43.03872500952719,47.509441871443954,49.16340844975285,51.038145396059335,52.313567971049295,43.67474211036657,48.57752501254542,54.864186481499615,56.53339181278622,12.737028779098711,12.660157488489755,5.707398834414216,8.986738475300323,16.39282877778357,19.7895569278263,5.115792759051186,5.0,4.0,5.0,5.0,6.0,Female,5208.522270126043,51514.57142857143,
17+
2,2020.0,1,12845,46.8943907391439,48.350554865080625,37.828872274266644,43.62805356928378,51.459560516858545,53.51683435066312,52.02370218382992,54.433601869152156,42.07550869519429,49.564212064271345,56.82872756212411,58.210407079329464,11.824140190654514,11.467245016055564,4.926927068952009,7.978090824769531,15.329544833125995,19.09122294515114,5.121136629038537,5.0,4.0,5.0,6.0,6.0,Total,10796.769532685732,103370.14285714286,
18+
2,2020.0,1,6224,47.96899417570204,49.18402098554201,39.43858198765237,45.293284485567774,52.07394297312881,54.045384576849315,52.46957183486846,54.57906838055987,43.81012620762393,50.21954392130845,56.92039773670731,58.311158811958315,11.185117519435014,10.927660466221665,4.44708704895973,7.514005676596507,14.614312897317667,18.029534764177356,5.100739074550129,5.0,4.0,5.0,6.0,6.0,Male,5332.225349262266,49888.142857142855,
19+
2,2020.0,1,6621,45.884221310184316,47.332310886620654,36.587789444728934,42.29380442906302,50.76583433342208,52.849478871806284,51.60456720300243,54.250672045062565,40.616082800853974,48.83815864738823,56.77147987940553,58.118184740187296,12.424846595377467,12.018705697962497,5.3708913149072846,8.484208247667068,16.01820735564978,20.082233001931503,5.140311131249056,5.0,4.0,5.0,6.0,6.0,Female,5464.5441834233925,53482.0,
20+
2,2021.0,1,12377,46.375521259774125,47.15568126202504,40.11917374836849,43.95911212778073,49.52213980184484,51.35953139988363,51.786930070277975,53.463401311629575,43.71027120349299,49.62057095740343,55.84278197105513,57.42085511065392,12.024720407180856,11.915797307189411,4.91834336453621,8.257742334829466,15.656637289305744,19.107541363081005,5.102044114082572,5.0,4.0,5.0,6.0,6.0,Total,10331.367001527977,99232.57142857142,
21+
2,2021.0,1,6007,47.35320566626662,48.21783558004387,41.39476992099278,45.1270607981105,50.29597546987339,51.99441094529906,52.34174661717516,53.791301515286406,45.25409167930417,50.281444671690004,56.192768799796916,57.66258565937774,11.433402977786962,11.313378598121375,4.62556667152762,7.792629366412121,14.953314619405578,18.307986046798455,5.05410354586316,5.0,4.0,5.0,5.0,6.0,Male,5114.592653347977,47708.57142857143,
22+
2,2021.0,1,6370,45.45355105101435,46.253580404415615,39.09479084880615,43.039460070312394,48.61516702864053,50.42904590395287,51.26373022770162,53.147274101291124,42.548802053394986,48.823671543610885,55.522269909732614,57.18430303887879,12.582341097662637,12.532152785088485,5.249683641766505,8.670952741531945,16.34757901397839,19.92761493142018,5.147252747252748,5.0,4.0,5.0,6.0,6.0,Female,5216.774348179943,51524.0,
23+
2,2022.0,1,12415,45.93027952183788,46.35968102663099,41.026642644299876,43.84286743019593,48.50239659443895,50.161266104215294,51.61100896394658,52.80887402649098,44.68976598431965,49.37283544472107,55.24758118595533,56.94241478048266,12.123247686097221,12.088632888884675,5.099994929636304,8.396241666322098,15.704133277945056,19.120553425952902,5.06532420459122,5.0,4.0,5.0,5.0,6.0,Total,10290.983879579622,98820.85714285714,
24+
2,2022.0,1,6007,46.87774871532713,47.426879878544554,41.89304724419556,44.97416752794771,49.34749615875357,50.837276881550935,52.22211516818635,53.2559067206558,45.97057986000124,50.174110959454616,55.63566775323229,57.28508864243988,11.46849508355423,11.480018723018494,4.553972133927307,7.773018470963829,14.95689309144465,18.265215460120576,5.0114865989678705,5.0,4.0,5.0,5.0,6.0,Male,5082.461558246085,47306.28571428571,
25+
2,2022.0,1,6408,45.04210108156178,45.42457458812706,40.37118048224564,43.03872500952719,47.509441871443954,49.16340844975285,51.03814458053992,52.313567971049295,43.67474211036657,48.57752501254542,54.864186481499615,56.53339181278622,12.737027162295046,12.660157488489755,5.707398834414216,8.986738475300323,16.39282877778357,19.7895569278263,5.115792759051186,5.0,4.0,5.0,5.0,6.0,Female,5208.522321333565,51514.57142857143,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ run,time,id_Statistics1,edi_p50,giniEquivalisedHouseholdDisposableIncomeNational
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,
77
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,
88
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,12263.982704603519,0.0,0.0,148.38590500605866,1261.7141240151734,2013.1915731965116,3075.643798622905,12263.982704603519,NaN,0.0,0.0,7.764439243557929,8.394977488465818,
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,

0 commit comments

Comments
 (0)