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

adding _annotation_mapping in AnalysisMixin #585

Merged
merged 85 commits into from
Jan 19, 2024
Merged

adding _annotation_mapping in AnalysisMixin #585

merged 85 commits into from
Jan 19, 2024

Commits on Jul 19, 2023

  1. _celltype_mapping draft

    Arina Danilina committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    e6651fd View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    68c1a01 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into add/celltype_mapping

    @ArinaDanilina
    ArinaDanilina authored Jul 19, 2023
    Configuration menu
    Copy the full SHA
    cdc3bc5 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. exposing celltype_mapping in SpatialMapping and SpatialAlignment

    Arina Danilina committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    c1acb13 View commit details
    Browse the repository at this point in the history

  2. fix ruff ?

    Arina Danilina committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    4324afa View commit details
    Browse the repository at this point in the history

  3. fix conflict

    Arina Danilina committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    2567c0b View commit details
    Browse the repository at this point in the history

  4. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    abcb8fc View commit details
    Browse the repository at this point in the history

  5. fixes for mypy and ruff

    Arina Danilina committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    c89236f View commit details
    Browse the repository at this point in the history

  6. renamin, adding function to protocol

    Arina Danilina committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    8a9138d View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. ruff fix?

    Arina Danilina committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    4539312 View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    d8f7714 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. Merge branch 'main' into add/celltype_mapping

    @ArinaDanilina
    ArinaDanilina authored Jul 26, 2023
    Configuration menu
    Copy the full SHA
    954956c View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. adding cell_transition_kwargs

    Arina Danilina committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    4944db6 View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    c2a2466 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into add/celltype_mapping

    Arina Danilina committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    268e2c5 View commit details
    Browse the repository at this point in the history

  4. ruff and mypy fix ?

    Arina Danilina committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    d10f82f View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2023

  1. Merge branch 'main' into add/celltype_mapping

    Arina Danilina committed Aug 12, 2023
    Configuration menu
    Copy the full SHA
    6bb5e20 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2023

  1. Merge branch 'main' into add/celltype_mapping

    Arina Danilina committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    e63eda8 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2023

  1. anno_mapping changes

    Arina Danilina committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    17d48b0 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2023

  1. Merge branch 'main' into add/celltype_mapping

    @ArinaDanilina
    ArinaDanilina authored Sep 27, 2023
    Configuration menu
    Copy the full SHA
    051270b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'add/celltype_mapping' of https://github.com/theislab/mo… 

    …scot into add/celltype_mapping
    Arina Danilina committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    6e8442e View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2023

  1. Merge branch 'main' into add/celltype_mapping

    @ArinaDanilina
    ArinaDanilina authored Oct 10, 2023
    Configuration menu
    Copy the full SHA
    86ed240 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into add/celltype_mapping

    @giovp
    giovp authored Oct 10, 2023
    Configuration menu
    Copy the full SHA
    c770d1d View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2023

  1. Merge branch 'add/celltype_mapping' of https://github.com/theislab/mo… 

    …scot into add/celltype_mapping
    Arina Danilina committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    956d7c6 View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    713e8e0 View commit details
    Browse the repository at this point in the history

  3. removed source and target groups

    Arina Danilina committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    b2a97c2 View commit details
    Browse the repository at this point in the history

  4. merge

    Arina Danilina committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    e81a681 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into add/celltype_mapping

    Arina Danilina committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    b44ec15 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2023

  1. Merge branch 'main' into add/celltype_mapping

    @ArinaDanilina
    ArinaDanilina authored Oct 20, 2023
    Configuration menu
    Copy the full SHA
    4f5a2b0 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. Merge branch 'main' into add/celltype_mapping

    @giovp
    giovp authored Oct 24, 2023
    Configuration menu
    Copy the full SHA
    f53b8be View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2023

  1. key_added logic

    Arina Danilina committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    189d468 View commit details
    Browse the repository at this point in the history

  2. key_added logic

    Arina Danilina committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    47b8ec5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'add/celltype_mapping' of https://github.com/theislab/mo… 

    …scot into add/celltype_mapping
    Arina Danilina committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    d434bfa View commit details
    Browse the repository at this point in the history

  4. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    7ac7e26 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Merge branch 'main' into add/celltype_mapping

    @ArinaDanilina
    ArinaDanilina authored Nov 16, 2023
    Configuration menu
    Copy the full SHA
    02109f0 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. anno_map progress

    Arina Danilina committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    5f5bf26 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'add/celltype_mapping' of https://github.com/theislab/mo… 

    …scot into add/celltype_mapping
    Arina Danilina committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    77605cf View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into add/celltype_mapping

    Arina Danilina committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    94c43b2 View commit details
    Browse the repository at this point in the history

  4. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    f7accd4 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'add/celltype_mapping' of https://github.com/theislab/mo… 

    …scot into add/celltype_mapping
    Arina Danilina committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    7478927 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2023

  1. Merge branch 'main' into add/celltype_mapping

    @ArinaDanilina
    ArinaDanilina authored Dec 1, 2023
    Configuration menu
    Copy the full SHA
    c408f37 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. mp fix, ap and tp added

    Arina Danilina committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    69c3e76 View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    878a79e View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. make sum for temporal problem work

    @giovp
    giovp committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    2366a32 View commit details
    Browse the repository at this point in the history

  2. fix max for temporal

    @giovp
    giovp committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    5bd6696 View commit details
    Browse the repository at this point in the history

  3. before merge

    Arina Danilina committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    5b3d508 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into add/celltype_mapping

    @giovp
    giovp authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    4651972 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. merge tp fix and added in cross_modality

    Arina Danilina committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    09a3920 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'add/celltype_mapping' of https://github.com/theislab/mo… 

    …scot into add/celltype_mapping
    Arina Danilina committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    415c40a View commit details
    Browse the repository at this point in the history

  3. passing batch key ap

    Arina Danilina committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    338e75a View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. cleaned arguments, forward in mp

    Arina Danilina committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    5a6d538 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2023

  1. fix for cross_modality and general label handling in max

    Arina Danilina committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    da8eac1 View commit details
    Browse the repository at this point in the history

  2. handling annottion labels

    Arina Danilina committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    10a79fe View commit details
    Browse the repository at this point in the history

  3. update

    @giovp
    giovp committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    d3f435b View commit details
    Browse the repository at this point in the history

  4. update

    @giovp
    giovp committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    3a37762 View commit details
    Browse the repository at this point in the history

  5. update

    @giovp
    giovp committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    72e545d View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2023

  1. update

    Arina Danilina committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    284c83d View commit details
    Browse the repository at this point in the history

  2. update

    @giovp
    giovp committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    fc7aba0 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2023

  1. shorter returns

    Arina Danilina committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    e26266d View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2024

  1. fix for temporal cell_transition

    Arina Danilina committed Jan 7, 2024
    Configuration menu
    Copy the full SHA
    96dd1d5 View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jan 7, 2024
    Configuration menu
    Copy the full SHA
    039ce1e View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. gt for annotation tests

    Arina Danilina committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    4c694ee View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    d6968f5 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. only passing tests

    Arina Danilina committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    112af8e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'add/celltype_mapping' of https://github.com/theislab/mo… 

    …scot into add/celltype_mapping
    Arina Danilina committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    f370bc1 View commit details
    Browse the repository at this point in the history

  3. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    e0efc2e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into add/celltype_mapping

    @ArinaDanilina
    ArinaDanilina authored Jan 10, 2024
    Configuration menu
    Copy the full SHA
    c055c8e View commit details
    Browse the repository at this point in the history

  5. ruff type annotation

    Arina Danilina committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    01637c8 View commit details
    Browse the repository at this point in the history

  6. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    2d9b73e View commit details
    Browse the repository at this point in the history

  7. Revert "ruff type annotation" 

    This reverts commit 01637c8.
    Arina Danilina committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    6a5ad0b View commit details
    Browse the repository at this point in the history

  8. revert

    Arina Danilina committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    1cb646d View commit details
    Browse the repository at this point in the history

  9. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    93b2e8d View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. fully passing tests

    Arina Danilina committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    4d3c8db View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    e2b9c5b View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. some mypy fixes

    Arina Danilina committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    e1608b0 View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    ab89a42 View commit details
    Browse the repository at this point in the history

  3. ruff typing

    Arina Danilina committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    57c2649 View commit details
    Browse the repository at this point in the history

  4. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    2b8aa48 View commit details
    Browse the repository at this point in the history

  5. docstrings

    Arina Danilina committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    1586794 View commit details
    Browse the repository at this point in the history

  6. lint docstrings

    Arina Danilina committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    e13ef40 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. unexpose scale_by_marginals and edits

    Arina Danilina committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    a775e70 View commit details
    Browse the repository at this point in the history

  2. Update src/moscot/problems/cross_modality/_mixins.py 

    Co-authored-by: Giovanni Palla <[email protected]>
    @ArinaDanilina @giovp
    ArinaDanilina and giovp authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    93b561f View commit details
    Browse the repository at this point in the history

  3. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    8fb3776 View commit details
    Browse the repository at this point in the history

  4. returns -> Returns

    Arina Danilina committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    557139d View commit details
    Browse the repository at this point in the history

  5. returns -> Returns

    Arina Danilina committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    0cd1ae5 View commit details
    Browse the repository at this point in the history