diff --git a/tests/builds/zika/results/traits.json b/tests/builds/zika/results/traits.json index dff62f6a7..5db4eeda3 100644 --- a/tests/builds/zika/results/traits.json +++ b/tests/builds/zika/results/traits.json @@ -1,7 +1,7 @@ { "generated_by": { "program": "augur", - "version": "7.0.2" + "version": "23.0.0" }, "models": { "country": { @@ -18,115 +18,115 @@ "?" ], "equilibrium_probabilities": [ - 0.1104158199243125, - 0.11094277628591302, - 0.12516925536901208, - 0.11009818519330494, - 0.10985085411934534, - 0.11069290241684183, - 0.1074108274476887, - 0.10862311286608, - 0.10679626637750145 + 0.10992328385721929, + 0.10971488710341502, + 0.1149940761317819, + 0.10947236387351918, + 0.10920125028122922, + 0.11033751944551899, + 0.11418316062009878, + 0.10801510982973447, + 0.11415834885748312 ], - "rate": 1218.0261450210137, + "rate": 19.47764939379104, "transition_matrix": [ [ 0.0, - 1.1719046673902285, - 1.1186664433529891, - 1.153582065606435, - 1.1574813704704507, - 1.138908722633704, - 1.0555331364389124, - 1.1731336698053378, - 1.0377560606964669 + 1.1617329278390105, + 1.0950653838495845, + 1.1568795393337363, + 1.1597930260626945, + 1.1445102262324656, + 1.0438591177110124, + 1.1704674202290268, + 1.0435151710397008 ], [ - 1.1719046673902285, + 1.1617329278390105, 0.0, - 1.1878234580160734, - 1.0957553971205087, - 1.097669677030871, - 1.088541084955371, - 1.0737520369008318, - 1.105319811547196, - 1.0478963880451506 + 1.1876305570006327, + 1.0901792696001051, + 1.0916728092603898, + 1.0844635708512613, + 1.0444828441946323, + 1.0977356486818135, + 1.0438630200112955 ], [ - 1.1186664433529891, - 1.1878234580160734, + 1.0950653838495845, + 1.1876305570006327, 0.0, - 1.085197384498247, - 1.085561394854811, - 1.0821577803565052, - 1.4702669873997236, - 1.08532033415823, - 1.5329021760522545 + 1.0658423938551056, + 1.065645980508266, + 1.065032177215866, + 1.5615908088384225, + 1.063440197149293, + 1.563181472701706 ], [ - 1.153582065606435, - 1.0957553971205087, - 1.085197384498247, + 1.1568795393337363, + 1.0901792696001051, + 1.0658423938551056, 0.0, - 1.3206700135538822, - 1.0733982366705321, - 1.0421213125658426, - 1.0881382830971331, - 1.0272181358024501 + 1.357824708599192, + 1.083166320053977, + 1.043511357140567, + 1.0944329802739658, + 1.0432526971023814 ], [ - 1.1574813704704507, - 1.097669677030871, - 1.085561394854811, - 1.3206700135538822, + 1.1597930260626945, + 1.0916728092603898, + 1.065645980508266, + 1.357824708599192, 0.0, - 1.0749975461321606, - 1.0424026278327931, - 1.0897149930789145, - 1.0274788445176402 + 1.084418809371552, + 1.0435169201107206, + 1.095454115080102, + 1.0432575617608364 ], [ - 1.138908722633704, - 1.088541084955371, - 1.0821577803565052, - 1.0733982366705321, - 1.0749975461321606, + 1.1445102262324656, + 1.0844635708512613, + 1.065032177215866, + 1.083166320053977, + 1.084418809371552, 0.0, - 1.0403203225780708, - 1.3394147043043587, - 1.0255622652537624 + 1.0434793328773826, + 1.3707377076460117, + 1.0432245952332888 ], [ - 1.0555331364389124, - 1.0737520369008318, - 1.4702669873997236, - 1.0421213125658426, - 1.0424026278327931, - 1.0403203225780708, + 1.0438591177110124, + 1.0444828441946323, + 1.5615908088384225, + 1.043511357140567, + 1.0435169201107206, + 1.0434793328773826, 0.0, - 1.042745488585664, - 1.1110568978026878 + 1.04352741046799, + 1.0454276825937783 ], [ - 1.1731336698053378, - 1.105319811547196, - 1.08532033415823, - 1.0881382830971331, - 1.0897149930789145, - 1.3394147043043587, - 1.042745488585664, + 1.1704674202290268, + 1.0977356486818135, + 1.063440197149293, + 1.0944329802739658, + 1.095454115080102, + 1.3707377076460117, + 1.04352741046799, 0.0, - 1.027801958437185 + 1.0432662239425279 ], [ - 1.0377560606964669, - 1.0478963880451506, - 1.5329021760522545, - 1.0272181358024501, - 1.0274788445176402, - 1.0255622652537624, - 1.1110568978026878, - 1.027801958437185, + 1.0435151710397008, + 1.0438630200112955, + 1.563181472701706, + 1.0432526971023814, + 1.0432575617608364, + 1.0432245952332888, + 1.0454276825937783, + 1.0432662239425279, 0.0 ] ] @@ -139,25 +139,25 @@ "?" ], "equilibrium_probabilities": [ - 0.3100506417048805, - 0.28662652026143665, - 0.40332283803368285 + 0.3492565486784079, + 0.30498046473781987, + 0.3457629865837723 ], - "rate": 654.0837053410166, + "rate": 11.210793105935952, "transition_matrix": [ [ 0.0, - 1.097178611835401, - 2.2044953618719094 + 1.2210267787198055, + 1.9211454872976352 ], [ - 1.097178611835401, + 1.2210267787198055, 0.0, - 1.0970462842057513 + 1.3081255335648412 ], [ - 2.2044953618719094, - 1.0970462842057513, + 1.9211454872976352, + 1.3081255335648412, 0.0 ] ] @@ -167,14 +167,14 @@ "BRA/2016/FC_6706": { "country": "Brazil", "country_confidence": { - "Brazil": 1.0 + "Brazil": 0.9999999999999999 }, - "country_entropy": -1.000088900581841e-12, + "country_entropy": -9.99866855976916e-13, "region": "South America", "region_confidence": { - "South America": 0.9999999999999999 + "South America": 1.0 }, - "region_entropy": -9.99866855976916e-13 + "region_entropy": -1.000088900581841e-12 }, "COL/FLR_00008/2015": { "country": "Colombia", @@ -227,9 +227,9 @@ "HND/2016/HU_ME59": { "country": "Honduras", "country_confidence": { - "Honduras": 0.9999999999999999 + "Honduras": 1.0 }, - "country_entropy": -9.99866855976916e-13, + "country_entropy": -1.000088900581841e-12, "region": "North America", "region_confidence": { "North America": 1.0 @@ -239,138 +239,129 @@ "NODE_0000001": { "country": "Colombia", "country_confidence": { - "Brazil": 0.07945633329881518, - "Colombia": 0.3226983983895889, - "Panama": 0.13682284987590432, - "Venezuela": 0.09563965369863452 + "Brazil": 0.0022579051253078537, + "Colombia": 0.9849144927645334, + "Panama": 0.007708550308584401, + "Venezuela": 0.0022403065850751702 }, - "country_entropy": 2.018737500729686, + "country_entropy": 0.10114509571801507, "region": "South America", "region_confidence": { - "North America": 0.29313598128740154, - "Oceania": 0.09168291976109284, - "South America": 0.6151810989515057 + "North America": 0.007755546253661369, + "South America": 0.9922426160078985 }, - "region_entropy": 0.87766027905396 + "region_entropy": 0.045438379122730924 }, "NODE_0000002": { "country": "Ecuador", "country_confidence": { - "American Samoa": 0.10997552548036098, - "Colombia": 0.09989431409786935, - "Dominican Republic": 0.16826932238285874, - "Ecuador": 0.17802545105913029 + "American Samoa": 0.12643026653291956, + "Dominican Republic": 0.32842272659643884, + "Ecuador": 0.34629989220807794, + "Puerto Rico": 0.06705638536234296 }, - "country_entropy": 2.154141739736937, + "country_entropy": 1.599265125726348, "region": "South America", "region_confidence": { - "North America": 0.38100725898360394, - "Oceania": 0.16314680200493822, - "South America": 0.4558459390114578 + "North America": 0.4748305300273098, + "Oceania": 0.001142378380065711, + "South America": 0.5240270915926245 }, - "region_entropy": 1.0215629468709513 + "region_entropy": 0.7000242502190354 }, "NODE_0000003": { "country": "American Samoa", "country_confidence": { - "American Samoa": 0.17631989522753133, - "Dominican Republic": 0.10847374160603725, - "Ecuador": 0.1105650070995943, - "Puerto Rico": 0.12462317150669364 + "American Samoa": 0.28964512368680895, + "Dominican Republic": 0.11912288859523017, + "Ecuador": 0.12583046770595482, + "Puerto Rico": 0.15784824360237512 }, - "country_entropy": 2.1724033263500715, + "country_entropy": 1.880635570750307, "region": "South America", "region_confidence": { - "North America": 0.3562325626788766, - "Oceania": 0.25888434864265736, - "South America": 0.38488308867846593 + "North America": 0.473998567593121, + "Oceania": 0.0029810959121371406, + "South America": 0.523020336494742 }, - "region_entropy": 1.0850350342156874 + "region_entropy": 0.7101883015133632 }, "NODE_0000004": { "country": "Puerto Rico", "country_confidence": { - "American Samoa": 0.10499437705813953, - "Colombia": 0.09466144242637259, - "Honduras": 0.1448594587036321, - "Puerto Rico": 0.2366790135700452 + "American Samoa": 0.11852965617580684, + "Ecuador": 0.05011108777036785, + "Honduras": 0.2725687010823244, + "Puerto Rico": 0.4273664878195694 }, - "country_entropy": 2.118660878117303, + "country_entropy": 1.5423144503616837, "region": "North America", "region_confidence": { - "North America": 0.5261286709887374, - "Oceania": 0.1458972995515814, - "South America": 0.32797402945968124 + "North America": 0.9891647427110036, + "South America": 0.010775583742587988 }, - "region_entropy": 0.9843478616917831 + "region_entropy": 0.060175250209930586 }, "NODE_0000005": { "country": "Brazil", "country_confidence": { - "American Samoa": 0.11972554935262582, - "Brazil": 0.1507966833916663, - "Colombia": 0.12438364361935775, - "Puerto Rico": 0.10502787959581086 + "American Samoa": 0.14443367483447164, + "Brazil": 0.3034894700804661, + "Colombia": 0.29907046931462716, + "Puerto Rico": 0.07741498057413597 }, - "country_entropy": 2.186554518053859, + "country_entropy": 1.7224863975907565, "region": "South America", "region_confidence": { - "North America": 0.32285681927205245, - "Oceania": 0.19580434660243187, - "South America": 0.4813388341255157 + "North America": 0.022177634283908496, + "South America": 0.9777275796040401 }, - "region_entropy": 1.036238034652324 + "region_entropy": 0.10736792745151319 }, "NODE_0000006": { "country": "Colombia", "country_confidence": { - "Brazil": 0.11313197238481473, - "Colombia": 0.16856890130925017, - "Panama": 0.11465777045473406, - "Venezuela": 0.10412669543948376 + "American Samoa": 0.07278005326712449, + "Brazil": 0.15226106762574995, + "Colombia": 0.6386039462093536, + "Puerto Rico": 0.039336197996026154 }, - "country_entropy": 2.1810900801522686, + "country_entropy": 1.2515732142089817, "region": "South America", "region_confidence": { - "North America": 0.3235610283053639, - "Oceania": 0.1749697588511744, - "South America": 0.5014692128434618 + "North America": 0.015012142967565416, + "South America": 0.984896171136012 }, - "region_entropy": 1.0162135184248304 + "region_entropy": 0.07887602936668373 }, "NODE_0000007": { - "country": "Panama", + "country": "Colombia", "country_confidence": { - "Brazil": 0.06797982839209754, - "Colombia": 0.18782697371753937, - "Panama": 0.3075719267837599, - "Venezuela": 0.1168498412686179 + "Colombia": 0.9754227346123652, + "Panama": 0.017776940467964485, + "Venezuela": 0.005109985383080483 }, - "country_entropy": 1.9895769282992368, + "country_entropy": 0.1362930094168421, "region": "South America", "region_confidence": { - "North America": 0.46050250999973946, - "Oceania": 0.06530129418333828, - "South America": 0.4741961958169224 + "North America": 0.015101767190481261, + "South America": 0.9848832186986346 }, - "region_entropy": 0.8890951142711935 + "region_entropy": 0.07848955387555177 }, "NODE_0000008": { "country": "Colombia", "country_confidence": { - "Brazil": 0.056311736020908165, - "Colombia": 0.2998617126669062, - "Panama": 0.10504336697886563, - "Venezuela": 0.2762265278730288 + "Colombia": 0.980180785729777, + "Panama": 0.005093399740731341, + "Venezuela": 0.014215781544964657 }, - "country_entropy": 1.88890190040285, + "country_entropy": 0.1116646292345948, "region": "South America", "region_confidence": { - "North America": 0.19413630884287936, - "Oceania": 0.042516070652408484, - "South America": 0.7633476205047122 + "South America": 0.9998873312011973 }, - "region_entropy": 0.6586233053211171 + "region_entropy": 0.0011396522870855813 }, "PAN/CDC_259359_V1_V3/2015": { "country": "Panama", @@ -387,9 +378,9 @@ "PRVABC59": { "country": "Puerto Rico", "country_confidence": { - "Puerto Rico": 0.9999999999999999 + "Puerto Rico": 1.0 }, - "country_entropy": -9.99866855976916e-13, + "country_entropy": -1.000088900581841e-12, "region": "North America", "region_confidence": { "North America": 1.0 @@ -416,9 +407,9 @@ "country_entropy": -9.99866855976916e-13, "region": "Oceania", "region_confidence": { - "Oceania": 1.0 + "Oceania": 0.9999999999999999 }, - "region_entropy": -1.000088900581841e-12 + "region_entropy": -9.99866855976916e-13 } } } \ No newline at end of file diff --git a/tests/functional/traits/traits_region.json b/tests/functional/traits/traits_region.json index 2e420eed9..c3794f4b8 100644 --- a/tests/functional/traits/traits_region.json +++ b/tests/functional/traits/traits_region.json @@ -1,7 +1,7 @@ { "generated_by": { "program": "augur", - "version": "14.1.0" + "version": "23.0.0" }, "models": { "region": { @@ -12,25 +12,25 @@ "?" ], "equilibrium_probabilities": [ - 0.31005064170488, - 0.28662652026143665, - 0.40332283803368346 + 0.3492565486784079, + 0.30498046473781987, + 0.3457629865837723 ], - "rate": 218.0279017803387, + "rate": 3.7369310353119842, "transition_matrix": [ [ 0.0, - 1.0971786118353992, - 2.204495361871908 + 1.2210267787198055, + 1.9211454872976352 ], [ - 1.0971786118353992, + 1.2210267787198055, 0.0, - 1.0970462842057542 + 1.3081255335648412 ], [ - 2.204495361871908, - 1.0970462842057542, + 1.9211454872976352, + 1.3081255335648412, 0.0 ] ] @@ -59,10 +59,10 @@ "region": "South America" }, "NODE_0000002": { - "region": "North America" + "region": "South America" }, "NODE_0000003": { - "region": "North America" + "region": "South America" }, "NODE_0000004": { "region": "North America" diff --git a/tests/functional/traits/traits_with_missing_region.json b/tests/functional/traits/traits_with_missing_region.json index f2796674f..793717a88 100644 --- a/tests/functional/traits/traits_with_missing_region.json +++ b/tests/functional/traits/traits_with_missing_region.json @@ -1,7 +1,7 @@ { "generated_by": { "program": "augur", - "version": "18.1.0" + "version": "23.0.0" }, "models": { "region": { @@ -12,25 +12,25 @@ "?" ], "equilibrium_probabilities": [ - 0.2937135406086192, - 0.2682094003586489, - 0.4380770590327319 + 0.265646217971813, + 0.34327012422701614, + 0.3910836578011709 ], - "rate": 256.91544578481756, + "rate": 2.640089828843385, "transition_matrix": [ [ 0.0, - 1.0936742264236954, - 2.2244614853809708 + 1.4755341856929653, + 1.5895341821767266 ], [ - 1.0936742264236954, + 1.4755341856929653, 0.0, - 1.086197824238873 + 1.4921103908681614 ], [ - 2.2244614853809708, - 1.086197824238873, + 1.5895341821767266, + 1.4921103908681614, 0.0 ] ]