Commit aa3cfc42 by Huang Di

fix s1 s2 display bug

parent 36da3345
...@@ -532,7 +532,7 @@ class TreeBuilder(object): ...@@ -532,7 +532,7 @@ class TreeBuilder(object):
for gene_flow, m1s in propotion.items(): for gene_flow, m1s in propotion.items():
s1, tar = gene_flow s1, tar = gene_flow
for m1 in m1s: for m1 in m1s:
s1, mix, m_pd = m1 s2, mix, m_pd = m1
# print(s2, tar, s1, mix, m_pd) # print(s2, tar, s1, mix, m_pd)
print(mat.format(s2, tar, s1, mix, m_pd)) print(mat.format(s2, tar, s1, mix, m_pd))
if (s1, tar) not in gene_flows_checked_by_propotion: if (s1, tar) not in gene_flows_checked_by_propotion:
...@@ -756,9 +756,9 @@ class TreeBuilder(object): ...@@ -756,9 +756,9 @@ class TreeBuilder(object):
if print_gene_flow: if print_gene_flow:
for l1, l2 in self.gene_flow: for l1, l2 in self.gene_flow:
options.append("%s -> %s [color=red]" % (l1, l2)) options.append("%s -> %s [color=red]" % (l1, l2))
print(self.populations) # print(self.populations)
print(self.relations) # print(self.relations)
print(RenderTree(self.root)) # print(RenderTree(self.root))
return DotExporter(self.root, options=options) return DotExporter(self.root, options=options)
def export_dot(self, filename, print_gene_flow=True): def export_dot(self, filename, print_gene_flow=True):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment