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

Allow for the possibility to have non-spatial populations in an otherwise spatial model #121

Merged
merged 46 commits into from
Feb 2, 2023
Merged

Allow for the possibility to have non-spatial populations in an otherwise spatial model #121

merged 46 commits into from
Feb 2, 2023

Commits on Jan 23, 2023

  1. Allow some populations to be non-spatial

    @bodkan
    bodkan committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    2616aa5 View commit details
    Browse the repository at this point in the history

  2. Turn error into warning

    @bodkan
    bodkan committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    76afeb5 View commit details
    Browse the repository at this point in the history

  3. Check for present of a population during gene flow

    @bodkan
    bodkan committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    e045907 View commit details
    Browse the repository at this point in the history

  4. Allow plotting for all gene-flow events at once on a map

    @bodkan
    bodkan committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    cbde9ca View commit details
    Browse the repository at this point in the history

  5. Add draft of the new example

    @bodkan
    bodkan committed Jan 23, 2023
    Configuration menu
    Copy the full SHA
    fa5c20d View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2023

  1. Merge branch 'main' into new-semispatial-example

    @bodkan
    bodkan committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    661e288 View commit details
    Browse the repository at this point in the history

  2. Allow mix of spatial and non-spatial populations

    @bodkan
    bodkan committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    9dc1517 View commit details
    Browse the repository at this point in the history

  3. Skip computing interactions of non-spatial populations in a model

    @bodkan
    bodkan committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    bae6296 View commit details
    Browse the repository at this point in the history

  4. Fix condition for map checks

    @bodkan
    bodkan committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    955f820 View commit details
    Browse the repository at this point in the history

  5. Non-spatial models must use an 'F' tag for all populations

    @bodkan
    bodkan committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    b700b60 View commit details
    Browse the repository at this point in the history

  6. Fix a silly typo (R lazy evaluation to the "rescue"!)

    @bodkan
    bodkan committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    bed2b9a View commit details
    Browse the repository at this point in the history

  7. Add visualization of mixed spatial & non-spatial models

    @bodkan
    bodkan committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    fbb0426 View commit details
    Browse the repository at this point in the history

  8. Expand the demes vignette with another 'semi-spatial' example

    @bodkan
    bodkan committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    264f558 View commit details
    Browse the repository at this point in the history

  9. Update NEWS

    @bodkan
    bodkan committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    df29d7d View commit details
    Browse the repository at this point in the history

  10. Give a warning when 'mixed' spatial/non-spatial models are compiled

    @bodkan
    bodkan committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    4d9343e View commit details
    Browse the repository at this point in the history

  11. Update startup message

    @bodkan
    bodkan committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    d47ddc9 View commit details
    Browse the repository at this point in the history

  12. Name chunk outputs

    @bodkan
    bodkan committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    60baf48 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2023

  1. Update website

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    0d22b4a View commit details
    Browse the repository at this point in the history

  2. Update note

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    d6cc5b8 View commit details
    Browse the repository at this point in the history

  3. Temporarily remove vignettes for faster checks

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    53f2d79 View commit details
    Browse the repository at this point in the history

  4. Update note

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    6654125 View commit details
    Browse the repository at this point in the history

  5. Fix typo

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    2507749 View commit details
    Browse the repository at this point in the history

  6. Restore vignette rendering

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    e5a52fe View commit details
    Browse the repository at this point in the history

  7. Fix consequences of a recent dplyr breaking change

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    0eb3605 View commit details
    Browse the repository at this point in the history

  8. Update startup message

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    c0e497c View commit details
    Browse the repository at this point in the history

  9. Update website

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    2bd1401 View commit details
    Browse the repository at this point in the history

  10. Attempt to fix a surprising new GitHub Actions conda issue

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    d48b61d View commit details
    Browse the repository at this point in the history

  11. Disable ADMIXTOOLS tests until the Reich server is back up

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    b04fc13 View commit details
    Browse the repository at this point in the history

  12. Fix conda shared Python bug that suddenly appeared

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    c13d178 View commit details
    Browse the repository at this point in the history

  13. Test non-pip installation of dependencies

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    1b83bf8 View commit details
    Browse the repository at this point in the history

  14. Emergency Python version downgrade

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    02c772a View commit details
    Browse the repository at this point in the history

  15. Emergency Python version downgrade

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    3079251 View commit details
    Browse the repository at this point in the history

  16. Write startup note when environment is already present

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    45b2fc3 View commit details
    Browse the repository at this point in the history

  17. Another test of Python install for GitHub actions

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    42d1eae View commit details
    Browse the repository at this point in the history

  18. Lock in Python version working on the Linux remote

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    1fc2eb0 View commit details
    Browse the repository at this point in the history

  19. Keep header files needed for ADMIXTOOLS and tskit

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    6fa332f View commit details
    Browse the repository at this point in the history

  20. Implement further changes on the testing Linux remote box

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    384b413 View commit details
    Browse the repository at this point in the history

  21. Print startup note even when env is not present

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    79dc8d4 View commit details
    Browse the repository at this point in the history

  22. Use the same env name in the CI pipeline as in the vignettes

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    86d5019 View commit details
    Browse the repository at this point in the history

  23. Update NEWS

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    5888615 View commit details
    Browse the repository at this point in the history

  24. Make sure all header files are installed on GitHub

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    6c07880 View commit details
    Browse the repository at this point in the history

  25. Seems like the Reich data is available again

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    616dc5b View commit details
    Browse the repository at this point in the history

  26. Update website

    @bodkan
    bodkan committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    fb88bd9 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2023

  1. Update the built-in example

    @bodkan
    bodkan committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    8326880 View commit details
    Browse the repository at this point in the history

  2. Update website

    @bodkan
    bodkan committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    6157673 View commit details
    Browse the repository at this point in the history

  3. Increase version to 0.5.0

    @bodkan
    bodkan committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    3724ca7 View commit details
    Browse the repository at this point in the history