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

Add Watterson's theta and Tajima's D into pixy #117

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

Add Watterson's theta and Tajima's D into pixy #117

wants to merge 18 commits into from

Commits on Sep 7, 2023

  1. Added watterson's theta function

    @npb596
    npb596 committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    0e4de7d View commit details
    Browse the repository at this point in the history

  2. Add alternative pi calculation

    @npb596
    npb596 committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    a89a4dd View commit details
    Browse the repository at this point in the history

  3. Added Tajima's D function

    @npb596
    npb596 committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    deac4a3 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2023

  1. Adding Watterson's theta utility to core

    @npb596
    npb596 committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    b9d3ec0 View commit details
    Browse the repository at this point in the history

  2. Adding Tajima's D utility in core

    @npb596
    npb596 committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    b2670f7 View commit details
    Browse the repository at this point in the history

  3. Correcting typo in calc Tajima's D function

    @npb596
    npb596 committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    e8b022d View commit details
    Browse the repository at this point in the history

  4. Adding contingencies for new functions

    @npb596
    npb596 committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    061225d View commit details
    Browse the repository at this point in the history

  5. Allow main to interpret Watterson's theta and Tajima's D as options

    @npb596
    npb596 committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    e0e8d81 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. Adding new functionality briefly to header

    @npb596
    npb596 committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    79f60bd View commit details
    Browse the repository at this point in the history

  2. fix syntax errors found while running easley branch

    @npb596
    npb596 committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    b9b4ca4 View commit details
    Browse the repository at this point in the history

  3. modify core so it references global pixy.calc

    @npb596
    npb596 committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    4e6248e View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. Tajima's D now reports "NA" value when there are no variant sites

    @npb596
    npb596 committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    4a9b586 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2023

  1. Fixed issues found in easley branch (check it for specifics)

    @npb596
    npb596 committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    b171029 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. Sped up weighted sites calculation with numpy multiply

    @npb596
    npb596 committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    5981557 View commit details
    Browse the repository at this point in the history

  2. Erased some useless white spaces

    @npb596
    npb596 committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    870bd58 View commit details
    Browse the repository at this point in the history

  3. numpy use in raw watterson_theta is still not optimized so return to … 

    …old loop approach
    @npb596
    npb596 committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    4ef1147 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2023

  1. Merge branch 'ksamuk:master' into master

    @npb596
    npb596 authored Dec 19, 2023
    Configuration menu
    Copy the full SHA
    9499804 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. Merge remote-tracking branch 'upstream/master'

    @npb596
    npb596 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    bf245e5 View commit details
    Browse the repository at this point in the history