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

MRG: modify annotate for flexibility #2518

Merged
merged 102 commits into from
Apr 5, 2023
Merged

MRG: modify annotate for flexibility #2518

merged 102 commits into from
Apr 5, 2023

Commits on Feb 8, 2023

  1. fix LineagePair usage?

    ctb authored and bluegenes committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    7cc6e3f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    95bcf8e View commit details
    Browse the repository at this point in the history
  3. fix comment

    bluegenes committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    3418594 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    956c158 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2023

  1. Configuration menu
    Copy the full SHA
    50619cd View commit details
    Browse the repository at this point in the history
  2. addl tests

    bluegenes committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    03cf9e3 View commit details
    Browse the repository at this point in the history
  3. init cami output

    bluegenes committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    63d1d9d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    01f8196 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    71b901a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    8f722af View commit details
    Browse the repository at this point in the history
  7. wording

    bluegenes committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    4ae1c7c View commit details
    Browse the repository at this point in the history
  8. test init fail

    bluegenes committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    0db767e View commit details
    Browse the repository at this point in the history
  9. fix

    bluegenes committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    a3cf4a1 View commit details
    Browse the repository at this point in the history
  10. fix2

    bluegenes committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    7386e5b View commit details
    Browse the repository at this point in the history
  11. resolve issues from merge

    bluegenes committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    6b5f2cd View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    0f882d7 View commit details
    Browse the repository at this point in the history
  13. clarify comment

    bluegenes committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    842ba39 View commit details
    Browse the repository at this point in the history
  14. clarify comment2

    bluegenes committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    ce3c991 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2023

  1. undelete line

    bluegenes committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    87f7e50 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5580bfc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    de496c4 View commit details
    Browse the repository at this point in the history
  4. add filled_pos

    bluegenes committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    9b139b6 View commit details
    Browse the repository at this point in the history
  5. read LIN into LineageDB

    bluegenes committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    d72df57 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f39aa54 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    360cfd9 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2023

  1. Configuration menu
    Copy the full SHA
    6a80bc1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5c3e0b5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ee2bb20 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9c72740 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2023

  1. naming

    bluegenes committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    97e52cb View commit details
    Browse the repository at this point in the history
  2. tmp save

    bluegenes committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    e7efbf7 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2023

  1. Configuration menu
    Copy the full SHA
    d573cb1 View commit details
    Browse the repository at this point in the history
  2. add LINgroup summarization

    bluegenes committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    69ed6a9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    871708b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    49558d9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6f26e0b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a040a4b View commit details
    Browse the repository at this point in the history
  7. test bad cli inputs

    bluegenes committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    7cb5700 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2023

  1. Configuration menu
    Copy the full SHA
    10ad4e6 View commit details
    Browse the repository at this point in the history
  2. rm print

    bluegenes committed Feb 16, 2023
    Configuration menu
    Copy the full SHA
    6e6a34c View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2023

  1. Configuration menu
    Copy the full SHA
    e0eff6e View commit details
    Browse the repository at this point in the history
  2. lingroup output as tsv

    bluegenes committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    acfc843 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bb1aea3 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2023

  1. Configuration menu
    Copy the full SHA
    7dba708 View commit details
    Browse the repository at this point in the history
  2. rm print st

    bluegenes committed Feb 18, 2023
    Configuration menu
    Copy the full SHA
    1bb6990 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4558644 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2023

  1. Configuration menu
    Copy the full SHA
    6fe08f1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8fcd26b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8ebdfe2 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2023

  1. Configuration menu
    Copy the full SHA
    7379b02 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2023

  1. Configuration menu
    Copy the full SHA
    6a4449c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3402c73 View commit details
    Browse the repository at this point in the history
  3. change LINs test filename

    bluegenes committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    ad367f2 View commit details
    Browse the repository at this point in the history
  4. clean up

    bluegenes committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    2e82b19 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    95ef04b View commit details
    Browse the repository at this point in the history
  6. add some docs

    bluegenes committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    caa42f6 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. MRG: LineageTree class to help with LINGroup ordering (#2496)

    Note: based off of #2469
    
    - Rewrites `build_tree`, `find_lca` functions as `LineageTree` class.
    Using same tests, we produce same results
    - Adds `ordered_paths` method to produce ~ordered lineages from tree for
    LINgroup ordered output.
    - Removes `num_bp_assigned` column because it was artificial anyway (our
    counts are all assigned at the genome level) and we're not trying to
    replicate a format exactly, as we are with `kreport` output, where we
    have this column.
    
    Note that LINgroups will not be ordered _absolutely_, as there will be
    some stochasticity as we descend the dictionary. Instead, related
    subpaths will be grouped.
    
    e.g. two potential outputs: 
    
    ```
    LINgroup_name	LINgroup_prefix	percent_containment	num_bp_contained	num_bp_assigned
    lg3	2;0;0	1.56	192000	0
    lg1	0;0;0	5.82	714000	0
    lg2	1;0;0	5.05	620000	0
    lg3	1;0;1	0.65	80000	0
    lg4	1;0;1;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0	0.65	80000	80000
    ```
    
    ```
    LINgroup_name	LINgroup_prefix	percent_containment	num_bp_contained	num_bp_assigned
    lg2	1;0;0	5.05	620000	0
    lg3	1;0;1	0.65	80000	0
    lg4	1;0;1;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0	0.65	80000	80000
    lg1	0;0;0	5.82	714000	0
    lg3	2;0;0	1.56	192000	0
    ```
    
    In these examples, the `1;0`.. paths are always grouped together, but
    may come before or after the `0;0` and `2;0` groups
    bluegenes authored Mar 6, 2023
    Configuration menu
    Copy the full SHA
    2dd45b6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d117fca View commit details
    Browse the repository at this point in the history
  3. simplify linputs

    bluegenes committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    a08b46b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c57f688 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2023

  1. add demo as tutorial

    bluegenes committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    f21eb7c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ac32ff3 View commit details
    Browse the repository at this point in the history
  3. add data ref

    bluegenes committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    68e9afa View commit details
    Browse the repository at this point in the history
  4. fix typo

    bluegenes committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    b89f826 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    edd360a View commit details
    Browse the repository at this point in the history
  6. fix typo

    bluegenes committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    9617bea View commit details
    Browse the repository at this point in the history
  7. better content headers

    bluegenes committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    035e4b2 View commit details
    Browse the repository at this point in the history
  8. add refs for sourmash tax

    bluegenes committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    39b6010 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    8f8d9a6 View commit details
    Browse the repository at this point in the history
  10. flex

    bluegenes committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    10e5dda View commit details
    Browse the repository at this point in the history
  11. more description

    bluegenes committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    aac8669 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    7fcef3c View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    2751ebe View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    e8cb7a0 View commit details
    Browse the repository at this point in the history
  15. rank arg tests

    bluegenes committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    907b74c View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2023

  1. Configuration menu
    Copy the full SHA
    6b2d15c View commit details
    Browse the repository at this point in the history
  2. add tests

    bluegenes committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    4831ffe View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fc84132 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    eca0f87 View commit details
    Browse the repository at this point in the history
  5. rm blank

    bluegenes committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    d59fdc7 View commit details
    Browse the repository at this point in the history
  6. rm comment

    bluegenes committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    78fbbe0 View commit details
    Browse the repository at this point in the history
  7. add bioboxes lins test

    bluegenes committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    512f237 View commit details
    Browse the repository at this point in the history
  8. add bioboxes to docs

    bluegenes committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    22ac224 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2023

  1. fix typo

    bluegenes committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    10c67e5 View commit details
    Browse the repository at this point in the history
  2. one more cli test

    bluegenes committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    2a28569 View commit details
    Browse the repository at this point in the history
  3. init genome lins

    bluegenes committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    aaadb3f View commit details
    Browse the repository at this point in the history
  4. lingroups

    bluegenes committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    3ba7865 View commit details
    Browse the repository at this point in the history
  5. Update doc/command-line.md

    Co-authored-by: C. Titus Brown <titus@idyll.org>
    bluegenes and ctb authored Mar 9, 2023
    Configuration menu
    Copy the full SHA
    6ecef9c View commit details
    Browse the repository at this point in the history
  6. clean up

    bluegenes committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    fb4d213 View commit details
    Browse the repository at this point in the history
  7. add lins/lingroup to docs

    bluegenes committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    fd60be6 View commit details
    Browse the repository at this point in the history
  8. less forbidding :)

    bluegenes committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    521bc11 View commit details
    Browse the repository at this point in the history
  9. rm irrelevant comment

    bluegenes committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    a04a060 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    e606a30 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2023

  1. Configuration menu
    Copy the full SHA
    5804124 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8a22ee0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    76a3782 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    250f40e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ce4b8c4 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    6e36729 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    b71336c View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    4fe3b87 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    4b6c535 View commit details
    Browse the repository at this point in the history