Skip to content

Commit 85c6c32

Browse files
authored
Merge pull request #11 from davewalker5/hky85-substitution
Implemented the HKY85 substitution model
2 parents 4519154 + 5c65f2a commit 85c6c32

10 files changed

Lines changed: 319 additions & 111 deletions

File tree

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
,Taxon_1,Taxon_2,Taxon_3,Taxon_4,Taxon_5,Taxon_6,Taxon_7,Taxon_8
2-
Taxon_1,0.0,0.018219702226302027,0.018219735603677463,0.02232945480948009,0.030617018339994213,0.02439282840360737,0.01821975885462701,0.03479538565766437
3-
Taxon_2,0.018219702226302027,0.0,0.02853649535271618,0.032703336340451694,0.04110693360506224,0.03479551265867519,0.028536530602033386,0.04534428666594305
4-
Taxon_3,0.018219735603677463,0.02853649535271618,0.0,0.01413244746928469,0.03479543163610506,0.028536627561545475,0.026461843531136585,0.04322272236275611
5-
Taxon_4,0.02232945480948009,0.032703336340451694,0.01413244746928469,0.0,0.036893436491802524,0.03061718083484881,0.028536630500259636,0.04534451450623014
6-
Taxon_5,0.030617018339994213,0.04110693360506224,0.03479543163610506,0.036893436491802524,0.0,0.01006732738477281,0.012097126770072644,0.028536385228448646
7-
Taxon_6,0.02439282840360737,0.03479551265867519,0.028536627561545475,0.03061718083484881,0.01006732738477281,0.0,0.006024157529033722,0.022329397406809236
8-
Taxon_7,0.01821975885462701,0.028536530602033386,0.026461843531136585,0.028536630500259636,0.012097126770072644,0.006024157529033722,0.0,0.01617328203901011
9-
Taxon_8,0.03479538565766437,0.04534428666594305,0.04322272236275611,0.04534451450623014,0.028536385228448646,0.022329397406809236,0.01617328203901011,0.0
2+
Taxon_1,0.0,0.018222726885298832,0.018222718433279644,0.02233805190080341,0.03061998107902342,0.024395776024465427,0.018222791421327985,0.034795471631397776
3+
Taxon_2,0.018222726885298832,0.0,0.028537559731535447,0.03270864627778447,0.04110795292355397,0.03479650947613942,0.02853771418275907,0.0453453650751358
4+
Taxon_3,0.018222718433279644,0.028537559731535447,0.0,0.014133720523551909,0.03479644723760468,0.028537667284059227,0.026467278903308855,0.04322216657530347
5+
Taxon_4,0.02233805190080341,0.03270864627778447,0.014133720523551909,0.0,0.03690617822573075,0.030629747460649462,0.028559374911983827,0.04534984603461075
6+
Taxon_5,0.03061998107902342,0.04110795292355397,0.03479644723760468,0.03690617822573075,0.0,0.010072799445289052,0.012097099807314259,0.028542080310967333
7+
Taxon_6,0.024395776024465427,0.03479650947613942,0.028537667284059227,0.030629747460649462,0.010072799445289052,0.0,0.006024147424968367,0.022334996717973447
8+
Taxon_7,0.018222791421327985,0.02853771418275907,0.026467278903308855,0.028559374911983827,0.012097099807314259,0.006024147424968367,0.0,0.016178852166213727
9+
Taxon_8,0.034795471631397776,0.0453453650751358,0.04322216657530347,0.04534984603461075,0.028542080310967333,0.022334996717973447,0.016178852166213727,0.0

data/output/relaxed_clock/distance_matrix.json

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"distance_metric": "f81",
2+
"distance_metric": "hky85",
33
"labels": [
44
"Taxon_1",
55
"Taxon_2",
@@ -13,82 +13,82 @@
1313
"matrix": [
1414
[
1515
0.0,
16-
0.018219702226302027,
17-
0.018219735603677463,
18-
0.02232945480948009,
19-
0.030617018339994213,
20-
0.02439282840360737,
21-
0.01821975885462701,
22-
0.03479538565766437
16+
0.018222726885298832,
17+
0.018222718433279644,
18+
0.02233805190080341,
19+
0.03061998107902342,
20+
0.024395776024465427,
21+
0.018222791421327985,
22+
0.034795471631397776
2323
],
2424
[
25-
0.018219702226302027,
25+
0.018222726885298832,
2626
0.0,
27-
0.02853649535271618,
28-
0.032703336340451694,
29-
0.04110693360506224,
30-
0.03479551265867519,
31-
0.028536530602033386,
32-
0.04534428666594305
27+
0.028537559731535447,
28+
0.03270864627778447,
29+
0.04110795292355397,
30+
0.03479650947613942,
31+
0.02853771418275907,
32+
0.0453453650751358
3333
],
3434
[
35-
0.018219735603677463,
36-
0.02853649535271618,
35+
0.018222718433279644,
36+
0.028537559731535447,
3737
0.0,
38-
0.01413244746928469,
39-
0.03479543163610506,
40-
0.028536627561545475,
41-
0.026461843531136585,
42-
0.04322272236275611
38+
0.014133720523551909,
39+
0.03479644723760468,
40+
0.028537667284059227,
41+
0.026467278903308855,
42+
0.04322216657530347
4343
],
4444
[
45-
0.02232945480948009,
46-
0.032703336340451694,
47-
0.01413244746928469,
45+
0.02233805190080341,
46+
0.03270864627778447,
47+
0.014133720523551909,
4848
0.0,
49-
0.036893436491802524,
50-
0.03061718083484881,
51-
0.028536630500259636,
52-
0.04534451450623014
49+
0.03690617822573075,
50+
0.030629747460649462,
51+
0.028559374911983827,
52+
0.04534984603461075
5353
],
5454
[
55-
0.030617018339994213,
56-
0.04110693360506224,
57-
0.03479543163610506,
58-
0.036893436491802524,
55+
0.03061998107902342,
56+
0.04110795292355397,
57+
0.03479644723760468,
58+
0.03690617822573075,
5959
0.0,
60-
0.01006732738477281,
61-
0.012097126770072644,
62-
0.028536385228448646
60+
0.010072799445289052,
61+
0.012097099807314259,
62+
0.028542080310967333
6363
],
6464
[
65-
0.02439282840360737,
66-
0.03479551265867519,
67-
0.028536627561545475,
68-
0.03061718083484881,
69-
0.01006732738477281,
65+
0.024395776024465427,
66+
0.03479650947613942,
67+
0.028537667284059227,
68+
0.030629747460649462,
69+
0.010072799445289052,
7070
0.0,
71-
0.006024157529033722,
72-
0.022329397406809236
71+
0.006024147424968367,
72+
0.022334996717973447
7373
],
7474
[
75-
0.01821975885462701,
76-
0.028536530602033386,
77-
0.026461843531136585,
78-
0.028536630500259636,
79-
0.012097126770072644,
80-
0.006024157529033722,
75+
0.018222791421327985,
76+
0.02853771418275907,
77+
0.026467278903308855,
78+
0.028559374911983827,
79+
0.012097099807314259,
80+
0.006024147424968367,
8181
0.0,
82-
0.01617328203901011
82+
0.016178852166213727
8383
],
8484
[
85-
0.03479538565766437,
86-
0.04534428666594305,
87-
0.04322272236275611,
88-
0.04534451450623014,
89-
0.028536385228448646,
90-
0.022329397406809236,
91-
0.01617328203901011,
85+
0.034795471631397776,
86+
0.0453453650751358,
87+
0.04322216657530347,
88+
0.04534984603461075,
89+
0.028542080310967333,
90+
0.022334996717973447,
91+
0.016178852166213727,
9292
0.0
9393
]
9494
]

0 commit comments

Comments
 (0)