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.

Sign up for GitHub

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

Jump to bottom

Improve two operators, and provide a starting tree generator #19

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Improve two operators, and provide a starting tree generator #19

wants to merge 8 commits into from

Conversation

Anaphory
Copy link

  • Compute logs earlie, to avoid overflow errors
  • Allow sampled ancestors to not sample every leaf (even contemporary leaves!) but only a given list.

Anaphory and others added 3 commits March 23, 2021 16:52
@Anaphory
Move log computation earlier
1b67e9a 
In linguistics, we tend to measure times in years, so heights are in the
order of magnitude of 100s to 1000s, not the 0.1My often found in
biology. In order to avoid overflow errors, the log should be taken
ASAP, and in fact this does not make the computation more expensive.
@Anaphory
Add option to sample a subset of leaves
5295a3a
Fix initialization
c1a3598
@Anaphory
Copy link
Author

Anaphory commented Mar 25, 2021 •
edited
Loading

Currently, this commit fails, because in CompEvol/beast2@e861d5e#diff-83eae796a2334747cb46384b066fe7678ffd80b08c228c6d704041a57a12ac9bL99-L101 the recently introduced method isTreeScaler was renamed to m_bIsTreeScaler, in a commit that otherwise only touches version numbers, years etc.. It looks like a search-and-replace gone awry (@alexeid & @tgvaughan, what do you think?) so I'm hesitant to fix this code to use the new method name.

@alexeid
Copy link
Member

alexeid commented Mar 29, 2021 via email

@Anaphory
Modify tree, then set root.
5c93ce3 
This should fix one of the symptoms of CompEvol/beast2#984 and also CompEvol#16
@Anaphory
Copy link
Author

I have added the suggested small modification I mentioned in #16 to be able to use tree.setRoot() instead of tree.setRootOnly() in the SAWilsonBalding. Do you want to trigger running the workflows, so we see whether I messed with something unpredictably?

@Anaphory Anaphory mentioned this pull request Jul 21, 2021
Open
@Anaphory Anaphory force-pushed the improve-leaftosajump branch from e11c48a to 6b2b5e1 Compare July 21, 2021 22:04
Keep Sampled Ancestors as such.
0b2d58e 
The SAWilsonBalding operator was permitted to turn sampled ancestors
into normal tips. For an analysis where certain tips should be kept
sampled ancestors, add a Boolean input (default: false) that aborts the
operator proposal when it is about to do this change.
@Anaphory Anaphory changed the title Improve LeafToSampledAncestorJump operator Improve two operators, and provide a starting tree generator Jul 22, 2021
@Anaphory
Copy link
Author

Do you still want to merge this, or should I make a separate package for it?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Anaphory @alexeid