Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Julia 1 8 #5

Merged
merged 2 commits into from
Aug 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/test_multispeciesnetwork.jl
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ Random.seed!(639)
genetree = PCS.simulatecoalescent(net, 1, 2, Ne)[1]
@test all(sort!([e.length for e in genetree.edge]) .> [1,1, 15,15, 800,800])
# modify the tree to have same population size on all branches
Ne = 300
Ne = 20
genetree = PCS.simulatecoalescent(net, 1, 2, Ne)[1]
@test all(sort!([e.length for e in genetree.edge]) .> [15,15, 15,15, 800,800])
@test all(sort!([e.length for e in genetree.edge]) .> [1,1, 1,1, 800,800])

# test edge cases (like incorrect input)
# (because i am hungry for 100% code coverage)
Expand Down
2 changes: 1 addition & 1 deletion test/test_onepopulation.jl
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ f1 = [e1,e2]
@test length(f1) == 1
net = PCS.convert2tree!(f1[1].node[1])
testgenetree = (VERSION < v"1.6" ? "(s1:0.6,s2:0.7);" : # for julia v1.5
( v"1.7" <= VERSION < v"1.8-" ? "(s2:1.1,s1:1.0);" : # for julia v1.7
( v"1.7" <= VERSION < v"1.9-" ? "(s2:1.1,s1:1.0);" : # for julia v1.7 or v1.8
"random genetree depends on RNG")) # for later
@test PN.writeTopology(net, round=true, digits=1) == testgenetree

Expand Down