search

tskit-dev / pyslim

Tools for dealing with tree sequences coming to and from SLiM.
MIT License
27 stars 23 forks source link

deal with `first` stage #277

Closed petrelharp closed 2 years ago

petrelharp commented 2 years ago

This closes #170, and is stacked on #275.

mergify[bot] commented 2 years ago

:warning: The sha of the head commit of this PR conflicts with #275. Mergify cannot evaluate rules on this PR. :warning:

petrelharp commented 2 years ago

Well, that was painful!

bhaller commented 2 years ago

Out of curiosity, why was it so painful? Also: what on earth does the message "The sha of the head commit of this PR conflicts with https://github.com/tskit-dev/pyslim/pull/275. Mergify cannot evaluate rules on this PR." mean, and what did you do to fix it??

petrelharp commented 2 years ago

It was painful because the right answers to "what SLiM time was this tskit time?" and "what age was this indvidual at this SLiM time?" depends on (a) the stage at which individuals were Remembered, (b) the stage at which the ts was written out, (c) the stage we're asking about the time of, and (d) whether its WF or nonWF. That's 54 different combinations. Have a look at these two tables which don't even get into discussing ages, which have a few more wrinkles.

The sha of the head commit of this PR conflicts with https://github.com/tskit-dev/pyslim/pull/275.

That message is because I started this PR on top of the commits from that other PR, and dissappeared once I merged the other PR. Mergify is a service that helps you do automatic merging of PRs and things like that; I'm not using it anyhow.

bhaller commented 2 years ago

54 different combinations, yeesh. I guess this was my revenge for the "remapping population table indices" thing. ;->

Re: the message, so basically two PRs both referenced the same SHA, because one was based upon the other, and mergify bot doesn't like that? OK, I think I see.