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

Large emhaplofreq #112

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Large emhaplofreq #112

wants to merge 4 commits into from

Conversation

alexlancaster
Copy link
Owner

@rsingle still needed or not?

meanwhile I'll resync with main

@alexlancaster
Copy link
Owner Author

Looks like the .dat file could be turned into a .pop for unit tests and moved to tests/data/ (or data/samples if they are just to be kept around). could they be repurposed for haplo-stats unit tests, since eventually we'll be moving to that?

@rsingle
Copy link
Collaborator

rsingle commented Aug 23, 2023

@rsingle still needed or not?

meanwhile I'll resync with main

I'd like to keep this branch around for a bit.

@rsingle
Copy link
Collaborator

rsingle commented Aug 23, 2023

Looks like the .dat file could be turned into a .pop for unit tests and moved to tests/data/ (or data/samples if they are just to be kept around). could they be repurposed for haplo-stats unit tests, since eventually we'll be moving to that?

Yes, that sounds like a good idea. I don't think it is worth spending a lot of time on the emhaplofreq-related questions for large size (but I still want to keep it around for a bit).

@alexlancaster
Copy link
Owner Author

alexlancaster commented Aug 24, 2023

Looks like the .dat file could be turned into a .pop for unit tests and moved to tests/data/ (or data/samples if they are just to be kept around). could they be repurposed for haplo-stats unit tests, since eventually we'll be moving to that?

Yes, that sounds like a good idea. I don't think it is worth spending a lot of time on the emhaplofreq-related questions for large size (but I still want to keep it around for a bit).

My general philosophy with branches is that most should be relatively short-lived, i.e. create them when working on a feature, then merge and delete when done. Otherwise they go stale quickly. That said, I'm happy to keep longer running branches going, so long as they are kept up to date with main.

So in that spirit, I propose that since the data files don't affect anything in the code - they should just be merged into main (they can be reworked into unit tests later). That just leaves the modifications to the emhaplofreq.h (which I think I made when I was playing around with runs - I don't know if there's anything critical there to keep). We can continue to keep this branch as a sandbox, but push any changes upstream as long as they don't break anything.

What about the separate changes the haplo-stats branch (#111)? That's a similar case, except that there's an additional emhaplofreqLDfix.c file

@alexlancaster alexlancaster force-pushed the large-emhaplofreq branch 2 times, most recently from 556cc6d to bc0e20b Compare September 5, 2023 02:47
@alexlancaster alexlancaster force-pushed the large-emhaplofreq branch 5 times, most recently from 9bea3f1 to f7195b2 Compare September 13, 2023 05:51
@alexlancaster alexlancaster force-pushed the large-emhaplofreq branch 5 times, most recently from ccb1174 to 9bc6925 Compare September 23, 2023 02:49
@alexlancaster alexlancaster force-pushed the large-emhaplofreq branch 5 times, most recently from 03e523b to b843e38 Compare October 3, 2023 05:25
@alexlancaster alexlancaster added this to the Nice-To-Have milestone Oct 4, 2023
@alexlancaster alexlancaster force-pushed the large-emhaplofreq branch 6 times, most recently from 674c73d to 4a0d41e Compare October 10, 2023 05:23
@alexlancaster alexlancaster force-pushed the large-emhaplofreq branch 2 times, most recently from 6c8fb91 to 01ffd89 Compare February 13, 2024 21:59
@alexlancaster alexlancaster force-pushed the large-emhaplofreq branch 2 times, most recently from 2841ad7 to 2403dcd Compare February 25, 2024 07:16
@alexlancaster alexlancaster force-pushed the large-emhaplofreq branch 2 times, most recently from 27f8c05 to f967575 Compare March 10, 2024 17:55
@alexlancaster alexlancaster force-pushed the large-emhaplofreq branch 2 times, most recently from 4dc109a to f42555a Compare March 24, 2024 02:03
@alexlancaster alexlancaster force-pushed the large-emhaplofreq branch 2 times, most recently from fb9a5a7 to f425de5 Compare June 18, 2024 03:52
@alexlancaster alexlancaster force-pushed the large-emhaplofreq branch 4 times, most recently from dea79ca to 8334f2d Compare September 15, 2024 02:54
@alexlancaster alexlancaster force-pushed the large-emhaplofreq branch 2 times, most recently from a85931d to 4b30580 Compare November 18, 2024 23:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants