from_ms(): fix various issues with -es/-ej commands. #352
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## main #352 +/- ##
=======================================
Coverage 99.92% 99.92%
=======================================
Files 5 5
Lines 1308 1369 +61
=======================================
+ Hits 1307 1368 +61
Misses 1 1
Continue to review full report at Codecov.
|
jeromekelleher
approved these changes
Jul 5, 2021
|
Ping me if you see any other crazy ms commands in your travels, and I'll double check things work as expected. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #350.
Closes #351.
This has introduced some ugliness into the main loop in
ms.py:build_graph(), but I'm not sure much can be done about that. At least it paves the way for being able to write a to_ms() function and expect the output to be round-tripped. I've done a cursory search of the literature for some complex looking ms commands, and added tests that these can be converted to a demes graph (several failed before the code refactoring here, because simultaneous -ej/-es commands seem to be used widely by ms afficionados).I haven't added SCRM's
-epscommand, but that shouldn't be too hard now (assuming someone requests it).https://github.com/scrm/scrm/wiki/Command-Line-Options#population-splits--merges