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

[MRG] Refactor/expand MinHash add, iadd, and merge functionality. #1282

Merged
merged 8 commits into from
Feb 6, 2021
Merged

[MRG] Refactor/expand MinHash add, iadd, and merge functionality. #1282

merged 8 commits into from
Feb 6, 2021

Commits on Jan 18, 2021

  1. add __add__ on MinHash objects, do simple testing

    @ctb
    ctb committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    eac0d2d View commit details
    Browse the repository at this point in the history

  2. fix aberrant merge test

    @ctb
    ctb committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    0193851 View commit details
    Browse the repository at this point in the history

  3. fix aberrant merge test, round 2

    @ctb
    ctb committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    680f6b4 View commit details
    Browse the repository at this point in the history

  4. fix merge tests

    @ctb
    ctb committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    6fc17f6 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2021

  1. Merge branch 'latest' into minhash_add_etc

    @ctb
    ctb committed Jan 20, 2021
    Configuration menu
    Copy the full SHA
    1266d05 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2021

  1. Merge branch 'latest' into minhash_add_etc

    @ctb
    ctb committed Feb 4, 2021
    Configuration menu
    Copy the full SHA
    0702d0f View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2021

  1. Merge branch 'latest' of github.com:dib-lab/sourmash into minhash_add… 

    …_etc
    @ctb
    ctb committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    d4b9d71 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'latest' into minhash_add_etc

    @luizirber
    luizirber committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    3b4a876 View commit details
    Browse the repository at this point in the history