Skip to content

Commit 7087ba6

Browse files
committed
Update symbolicCF.jl
improving function symCF to accommodate reindex
1 parent 191fb9a commit 7087ba6

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/symbolicCF.jl

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@ function symCF(network::HybridNetwork;
1313
#plotting::Bool=false
1414
)
1515

16-
#reindex net
17-
net=reindex_edges(deepcopy(network))
16+
#reindex net id needed
17+
net=deepcopy(network)
18+
if(reindex) reindex_edges(net) end
1819

1920
#get outputs
2021
quartet, taxa, df = network_expectedCF_formulas(net;
2122
showprogressbar=showprogressbar,
2223
inheritancecorrelation=inheritancecorrelation,
2324
symbolic=symbolic,
24-
reindex=reindex)
25+
reindex=false)
2526

2627
#SK: Throw an error (or warning) when symbolic = false && macaulay2/matlab... = true
2728
!symbolic && (macaulay2 || matlab || multigraded || singular) && error("Failed to reformat because symbolic CFs were not generated. Set symbolic=true." )
@@ -37,11 +38,11 @@ function symCF(network::HybridNetwork;
3738

3839
#plot using Phyloplots
3940
# if(plotting)
40-
edgelab=make_edge_label(net;showAllEdgeLabels=showAllEdgeLabels)
41+
edgelab=make_edge_label(net;showAllEdgeLabels=showAllEdgeLabels,reindex=false)
4142
# PhyloPlots.plot(net,edgelabel=edgelab)
4243
# end
4344

44-
return quartet, taxa, df, edgelab
45+
return quartet, taxa, df, edgelab, net
4546
end
4647

4748
"""

0 commit comments

Comments
 (0)