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

Fixed plotting for mixscape.plot_barplot and sccoda.plot_effects_barplot #667

Merged
merged 1 commit into from
Oct 11, 2024

Conversation

Lilly-May
Copy link
Collaborator

PR Checklist

Description of changes

mixscape.plot_barplot issue
As reported in #659, the effects bar plot wasn't visible. Adding a simple plt.tight_layout() fixed the issue. I also resolved some warnings that occurred during plotting by using ax.set_xticks instead of ax.set_xticklabels.

sccoda.plot_effects_barplot
Reported in #598 and theislab/single-cell-best-practices#271.
These issues were basically reporting the same problem: there was a bug in the code that caused covariates with only zero effects to be filtered out of the plotting dataframe, even when the plot_zero_covariate parameter was set to True (which is the default). This also led to incorrect figure titles. I resolved the issue by removing the line of code causing the bug.

For these results:
Bildschirmfoto 2024-10-11 um 11 20 18

So far, the generated plot looked like this (one plot missing, wrong titles):
Bildschirmfoto 2024-10-11 um 11 20 49

NOW, i.e. after merging this PR, it will look like this:
Bildschirmfoto 2024-10-11 um 11 21 22
Bildschirmfoto 2024-10-11 um 11 21 55

@github-actions github-actions bot added the bug Something isn't working label Oct 11, 2024
@codecov-commenter
Copy link

codecov-commenter commented Oct 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 65.56%. Comparing base (98e2bdb) to head (b8b3a78).
Report is 9 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #667   +/-   ##
=======================================
  Coverage   65.56%   65.56%           
=======================================
  Files          47       47           
  Lines        6105     6105           
=======================================
  Hits         4003     4003           
  Misses       2102     2102           
Files with missing lines Coverage Δ
pertpy/tools/_coda/_base_coda.py 56.30% <ø> (ø)
pertpy/tools/_mixscape.py 79.12% <ø> (ø)

@Zethson Zethson merged commit 9bba130 into main Oct 11, 2024
5 checks passed
stefanpeidli added a commit that referenced this pull request Feb 7, 2025
* Set legend anchor as parameter (#660)

* Fix missing space

* Remove explicit anndata in dependencies (#666)

* Incorporate use case tutorials (#665)

* Fixed DEG layer retrieval

* Use-case tutorial icons

* Restructure tutorial page

* Subgroup tutorials

* Improve KNN label_transfer in PerturbationSpace (#658)

* Add uncertainty score in KNN label_transfer in PerturbationSpace
Certainty is quantified as the fraction of nearest neighbors belonging to the classified (i.e. the most abundant) label compared to the total number of nearest neighbors.

* Update pre-commit-config.yaml
Replaces yanked dependency of mypy "types-pkg-resources" with "types-setuptools" as recommended: https://pypi.org/project/types-pkg-resources/

* Improve label imputation in PerturbationSpace class
Key changes:
- Now uses KNN graph in adata: saves cost and increases consistency
- Vectorized operations instead of expensive for loop
- Distance weighting for KNN imputation
- Quantifies uncertainty as local KNN label entropy

* Fixed plotting for mixscape.plot_barplot and sccoda.plot_effects_barplot (#667)

* Augur scsim warnings (#670)

* Augur scsim warnings

Signed-off-by: zethson <[email protected]>

* Submodules

Signed-off-by: zethson <[email protected]>

---------

Signed-off-by: zethson <[email protected]>

* Add PerturbationDataValidator (#672)

* Augur scsim warnings

Signed-off-by: zethson <[email protected]>

* Submodules

Signed-off-by: zethson <[email protected]>

* Add super draft of pertpy validator

Signed-off-by: zethson <[email protected]>

* Polish

Signed-off-by: zethson <[email protected]>

* Polish

Signed-off-by: zethson <[email protected]>

* Nested try

Signed-off-by: zethson <[email protected]>

* validator in test

Signed-off-by: zethson <[email protected]>

* try uv for rtd

Signed-off-by: zethson <[email protected]>

* rtd uv

Signed-off-by: zethson <[email protected]>

* rtd uv

Signed-off-by: zethson <[email protected]>

* rtd uv fix

Signed-off-by: zethson <[email protected]>

* mb sphinx fix for validator

Signed-off-by: zethson <[email protected]>

* docs

Signed-off-by: zethson <[email protected]>

* remove PerturbationValidator from docs

Signed-off-by: zethson <[email protected]>

* remove PerturbationValidator from docs

Signed-off-by: zethson <[email protected]>

---------

Signed-off-by: zethson <[email protected]>

* Latest OS for RTD

* Remove curator again

Signed-off-by: zethson <[email protected]>

* Fix jax random array (#686)

* Fix jax random array

Signed-off-by: zethson <[email protected]>

* Fix further jax warnings

Signed-off-by: zethson <[email protected]>

* Fix edger

Signed-off-by: zethson <[email protected]>

* Fix choice

Signed-off-by: zethson <[email protected]>

---------

Signed-off-by: zethson <[email protected]>

* Switch to formulaic-contrasts (#682)

* Switch to formulaic-contrasts

* Cleanup

* removing design matrix workaround (#691)

Co-authored-by: Emma Dann <[email protected]>

* Fix PyDESeq2

* Update tests

* fix typo in gitignore

* Remove contrast dataclass, which isnt used anywhere

* Fix edgeR rpy2 tests (#692)

* fix broken rpy2 edger tests

* updated edger tests

* Fix tests (scipy)

Signed-off-by: zethson <[email protected]>

* submodule

Signed-off-by: zethson <[email protected]>

* Remove unused code

Signed-off-by: zethson <[email protected]>

* type hints

Signed-off-by: zethson <[email protected]>

---------

Signed-off-by: zethson <[email protected]>
Co-authored-by: Emma Dann <[email protected]>
Co-authored-by: Emma Dann <[email protected]>
Co-authored-by: zethson <[email protected]>

* Release 0.9.5

Signed-off-by: zethson <[email protected]>

* Prepare 0.10.0

Signed-off-by: zethson <[email protected]>

* Added Mixscape seeds and test (#683)

Co-authored-by: Lukas Heumos <[email protected]>

* Fix probability data type (#696)

Signed-off-by: Lukas Heumos <[email protected]>

* Optimize MeanVarDistributionDistance (#697)

* Fix probability data type

Signed-off-by: Lukas Heumos <[email protected]>

* Optimize mean_var distance

Signed-off-by: Lukas Heumos <[email protected]>

---------

Signed-off-by: Lukas Heumos <[email protected]>

* Optimize test speed (#699)

* Try buildjet

Signed-off-by: Lukas Heumos <[email protected]>

* Try buildjet large

Signed-off-by: Lukas Heumos <[email protected]>

* speed up predict_differential_prioritization

Signed-off-by: Lukas Heumos <[email protected]>

* speed up tests

Signed-off-by: Lukas Heumos <[email protected]>

---------

Signed-off-by: Lukas Heumos <[email protected]>

* Lower bound for scikit-learn (#701)

Signed-off-by: Lukas Heumos <[email protected]>

* Fix type annotation

Signed-off-by: Lukas Heumos <[email protected]>

* Fix empty figure returns when show=True in plotting functions (#703)

* Removed show parameter

* Adapt plotting API for Augur, Coda, Dialogue

* Adapted plotting API for Milo, Mixscape, scgen

* Add joblib

* Remove joblib

---------

Co-authored-by: Lukas Heumos <[email protected]>

* Fix scikit-learn intendation

Signed-off-by: Lukas Heumos <[email protected]>

---------

Signed-off-by: zethson <[email protected]>
Signed-off-by: Lukas Heumos <[email protected]>
Co-authored-by: Lilly May <[email protected]>
Co-authored-by: Lukas Heumos <[email protected]>
Co-authored-by: Gregor Sturm <[email protected]>
Co-authored-by: Emma Dann <[email protected]>
Co-authored-by: Emma Dann <[email protected]>
stefanpeidli added a commit that referenced this pull request Feb 7, 2025
* Set legend anchor as parameter (#660)

* Fix missing space

* Remove explicit anndata in dependencies (#666)

* Incorporate use case tutorials (#665)

* Fixed DEG layer retrieval

* Use-case tutorial icons

* Restructure tutorial page

* Subgroup tutorials

* Improve KNN label_transfer in PerturbationSpace (#658)

* Add uncertainty score in KNN label_transfer in PerturbationSpace
Certainty is quantified as the fraction of nearest neighbors belonging to the classified (i.e. the most abundant) label compared to the total number of nearest neighbors.

* Update pre-commit-config.yaml
Replaces yanked dependency of mypy "types-pkg-resources" with "types-setuptools" as recommended: https://pypi.org/project/types-pkg-resources/

* Improve label imputation in PerturbationSpace class
Key changes:
- Now uses KNN graph in adata: saves cost and increases consistency
- Vectorized operations instead of expensive for loop
- Distance weighting for KNN imputation
- Quantifies uncertainty as local KNN label entropy

* Fixed plotting for mixscape.plot_barplot and sccoda.plot_effects_barplot (#667)

* Augur scsim warnings (#670)

* Augur scsim warnings

Signed-off-by: zethson <[email protected]>

* Submodules

Signed-off-by: zethson <[email protected]>

---------

Signed-off-by: zethson <[email protected]>

* Add PerturbationDataValidator (#672)

* Augur scsim warnings

Signed-off-by: zethson <[email protected]>

* Submodules

Signed-off-by: zethson <[email protected]>

* Add super draft of pertpy validator

Signed-off-by: zethson <[email protected]>

* Polish

Signed-off-by: zethson <[email protected]>

* Polish

Signed-off-by: zethson <[email protected]>

* Nested try

Signed-off-by: zethson <[email protected]>

* validator in test

Signed-off-by: zethson <[email protected]>

* try uv for rtd

Signed-off-by: zethson <[email protected]>

* rtd uv

Signed-off-by: zethson <[email protected]>

* rtd uv

Signed-off-by: zethson <[email protected]>

* rtd uv fix

Signed-off-by: zethson <[email protected]>

* mb sphinx fix for validator

Signed-off-by: zethson <[email protected]>

* docs

Signed-off-by: zethson <[email protected]>

* remove PerturbationValidator from docs

Signed-off-by: zethson <[email protected]>

* remove PerturbationValidator from docs

Signed-off-by: zethson <[email protected]>

---------

Signed-off-by: zethson <[email protected]>

* Latest OS for RTD

* Remove curator again

Signed-off-by: zethson <[email protected]>

* Fix jax random array (#686)

* Fix jax random array

Signed-off-by: zethson <[email protected]>

* Fix further jax warnings

Signed-off-by: zethson <[email protected]>

* Fix edger

Signed-off-by: zethson <[email protected]>

* Fix choice

Signed-off-by: zethson <[email protected]>

---------

Signed-off-by: zethson <[email protected]>

* Switch to formulaic-contrasts (#682)

* Switch to formulaic-contrasts

* Cleanup

* removing design matrix workaround (#691)

Co-authored-by: Emma Dann <[email protected]>

* Fix PyDESeq2

* Update tests

* fix typo in gitignore

* Remove contrast dataclass, which isnt used anywhere

* Fix edgeR rpy2 tests (#692)

* fix broken rpy2 edger tests

* updated edger tests

* Fix tests (scipy)

Signed-off-by: zethson <[email protected]>

* submodule

Signed-off-by: zethson <[email protected]>

* Remove unused code

Signed-off-by: zethson <[email protected]>

* type hints

Signed-off-by: zethson <[email protected]>

---------

Signed-off-by: zethson <[email protected]>
Co-authored-by: Emma Dann <[email protected]>
Co-authored-by: Emma Dann <[email protected]>
Co-authored-by: zethson <[email protected]>

* Release 0.9.5

Signed-off-by: zethson <[email protected]>

* Prepare 0.10.0

Signed-off-by: zethson <[email protected]>

* Added Mixscape seeds and test (#683)

Co-authored-by: Lukas Heumos <[email protected]>

* Fix probability data type (#696)

Signed-off-by: Lukas Heumos <[email protected]>

* Optimize MeanVarDistributionDistance (#697)

* Fix probability data type

Signed-off-by: Lukas Heumos <[email protected]>

* Optimize mean_var distance

Signed-off-by: Lukas Heumos <[email protected]>

---------

Signed-off-by: Lukas Heumos <[email protected]>

* Optimize test speed (#699)

* Try buildjet

Signed-off-by: Lukas Heumos <[email protected]>

* Try buildjet large

Signed-off-by: Lukas Heumos <[email protected]>

* speed up predict_differential_prioritization

Signed-off-by: Lukas Heumos <[email protected]>

* speed up tests

Signed-off-by: Lukas Heumos <[email protected]>

---------

Signed-off-by: Lukas Heumos <[email protected]>

* Lower bound for scikit-learn (#701)

Signed-off-by: Lukas Heumos <[email protected]>

* Fix type annotation

Signed-off-by: Lukas Heumos <[email protected]>

* Fix empty figure returns when show=True in plotting functions (#703)

* Removed show parameter

* Adapt plotting API for Augur, Coda, Dialogue

* Adapted plotting API for Milo, Mixscape, scgen

* Add joblib

* Remove joblib

---------

Co-authored-by: Lukas Heumos <[email protected]>

* Fix scikit-learn intendation

Signed-off-by: Lukas Heumos <[email protected]>

---------

Signed-off-by: zethson <[email protected]>
Signed-off-by: Lukas Heumos <[email protected]>
Co-authored-by: Lilly May <[email protected]>
Co-authored-by: Lukas Heumos <[email protected]>
Co-authored-by: Gregor Sturm <[email protected]>
Co-authored-by: Emma Dann <[email protected]>
Co-authored-by: Emma Dann <[email protected]>
@Lilly-May Lilly-May deleted the fix/mixscape_coda_plots branch February 10, 2025 10:46
Zethson added a commit that referenced this pull request Feb 20, 2025
* Implement mixture models for guide assignment

Key additions:
- Added a base abstract class "MixtureModel" with numpyro
- Added a first mixture model "Poisson_Gauss_Mixture"
- New function "assign_mixture_model" in GuideAssignment class

* Merge main into branch (#705)

* Set legend anchor as parameter (#660)

* Fix missing space

* Remove explicit anndata in dependencies (#666)

* Incorporate use case tutorials (#665)

* Fixed DEG layer retrieval

* Use-case tutorial icons

* Restructure tutorial page

* Subgroup tutorials

* Improve KNN label_transfer in PerturbationSpace (#658)

* Add uncertainty score in KNN label_transfer in PerturbationSpace
Certainty is quantified as the fraction of nearest neighbors belonging to the classified (i.e. the most abundant) label compared to the total number of nearest neighbors.

* Update pre-commit-config.yaml
Replaces yanked dependency of mypy "types-pkg-resources" with "types-setuptools" as recommended: https://pypi.org/project/types-pkg-resources/

* Improve label imputation in PerturbationSpace class
Key changes:
- Now uses KNN graph in adata: saves cost and increases consistency
- Vectorized operations instead of expensive for loop
- Distance weighting for KNN imputation
- Quantifies uncertainty as local KNN label entropy

* Fixed plotting for mixscape.plot_barplot and sccoda.plot_effects_barplot (#667)

* Augur scsim warnings (#670)

* Augur scsim warnings

Signed-off-by: zethson <[email protected]>

* Submodules

Signed-off-by: zethson <[email protected]>

---------

Signed-off-by: zethson <[email protected]>

* Add PerturbationDataValidator (#672)

* Augur scsim warnings

Signed-off-by: zethson <[email protected]>

* Submodules

Signed-off-by: zethson <[email protected]>

* Add super draft of pertpy validator

Signed-off-by: zethson <[email protected]>

* Polish

Signed-off-by: zethson <[email protected]>

* Polish

Signed-off-by: zethson <[email protected]>

* Nested try

Signed-off-by: zethson <[email protected]>

* validator in test

Signed-off-by: zethson <[email protected]>

* try uv for rtd

Signed-off-by: zethson <[email protected]>

* rtd uv

Signed-off-by: zethson <[email protected]>

* rtd uv

Signed-off-by: zethson <[email protected]>

* rtd uv fix

Signed-off-by: zethson <[email protected]>

* mb sphinx fix for validator

Signed-off-by: zethson <[email protected]>

* docs

Signed-off-by: zethson <[email protected]>

* remove PerturbationValidator from docs

Signed-off-by: zethson <[email protected]>

* remove PerturbationValidator from docs

Signed-off-by: zethson <[email protected]>

---------

Signed-off-by: zethson <[email protected]>

* Latest OS for RTD

* Remove curator again

Signed-off-by: zethson <[email protected]>

* Fix jax random array (#686)

* Fix jax random array

Signed-off-by: zethson <[email protected]>

* Fix further jax warnings

Signed-off-by: zethson <[email protected]>

* Fix edger

Signed-off-by: zethson <[email protected]>

* Fix choice

Signed-off-by: zethson <[email protected]>

---------

Signed-off-by: zethson <[email protected]>

* Switch to formulaic-contrasts (#682)

* Switch to formulaic-contrasts

* Cleanup

* removing design matrix workaround (#691)

Co-authored-by: Emma Dann <[email protected]>

* Fix PyDESeq2

* Update tests

* fix typo in gitignore

* Remove contrast dataclass, which isnt used anywhere

* Fix edgeR rpy2 tests (#692)

* fix broken rpy2 edger tests

* updated edger tests

* Fix tests (scipy)

Signed-off-by: zethson <[email protected]>

* submodule

Signed-off-by: zethson <[email protected]>

* Remove unused code

Signed-off-by: zethson <[email protected]>

* type hints

Signed-off-by: zethson <[email protected]>

---------

Signed-off-by: zethson <[email protected]>
Co-authored-by: Emma Dann <[email protected]>
Co-authored-by: Emma Dann <[email protected]>
Co-authored-by: zethson <[email protected]>

* Release 0.9.5

Signed-off-by: zethson <[email protected]>

* Prepare 0.10.0

Signed-off-by: zethson <[email protected]>

* Added Mixscape seeds and test (#683)

Co-authored-by: Lukas Heumos <[email protected]>

* Fix probability data type (#696)

Signed-off-by: Lukas Heumos <[email protected]>

* Optimize MeanVarDistributionDistance (#697)

* Fix probability data type

Signed-off-by: Lukas Heumos <[email protected]>

* Optimize mean_var distance

Signed-off-by: Lukas Heumos <[email protected]>

---------

Signed-off-by: Lukas Heumos <[email protected]>

* Optimize test speed (#699)

* Try buildjet

Signed-off-by: Lukas Heumos <[email protected]>

* Try buildjet large

Signed-off-by: Lukas Heumos <[email protected]>

* speed up predict_differential_prioritization

Signed-off-by: Lukas Heumos <[email protected]>

* speed up tests

Signed-off-by: Lukas Heumos <[email protected]>

---------

Signed-off-by: Lukas Heumos <[email protected]>

* Lower bound for scikit-learn (#701)

Signed-off-by: Lukas Heumos <[email protected]>

* Fix type annotation

Signed-off-by: Lukas Heumos <[email protected]>

* Fix empty figure returns when show=True in plotting functions (#703)

* Removed show parameter

* Adapt plotting API for Augur, Coda, Dialogue

* Adapted plotting API for Milo, Mixscape, scgen

* Add joblib

* Remove joblib

---------

Co-authored-by: Lukas Heumos <[email protected]>

* Fix scikit-learn intendation

Signed-off-by: Lukas Heumos <[email protected]>

---------

Signed-off-by: zethson <[email protected]>
Signed-off-by: Lukas Heumos <[email protected]>
Co-authored-by: Lilly May <[email protected]>
Co-authored-by: Lukas Heumos <[email protected]>
Co-authored-by: Gregor Sturm <[email protected]>
Co-authored-by: Emma Dann <[email protected]>
Co-authored-by: Emma Dann <[email protected]>

* Merge main into branch (#706)

* Set legend anchor as parameter (#660)

* Fix missing space

* Remove explicit anndata in dependencies (#666)

* Incorporate use case tutorials (#665)

* Fixed DEG layer retrieval

* Use-case tutorial icons

* Restructure tutorial page

* Subgroup tutorials

* Improve KNN label_transfer in PerturbationSpace (#658)

* Add uncertainty score in KNN label_transfer in PerturbationSpace
Certainty is quantified as the fraction of nearest neighbors belonging to the classified (i.e. the most abundant) label compared to the total number of nearest neighbors.

* Update pre-commit-config.yaml
Replaces yanked dependency of mypy "types-pkg-resources" with "types-setuptools" as recommended: https://pypi.org/project/types-pkg-resources/

* Improve label imputation in PerturbationSpace class
Key changes:
- Now uses KNN graph in adata: saves cost and increases consistency
- Vectorized operations instead of expensive for loop
- Distance weighting for KNN imputation
- Quantifies uncertainty as local KNN label entropy

* Fixed plotting for mixscape.plot_barplot and sccoda.plot_effects_barplot (#667)

* Augur scsim warnings (#670)

* Augur scsim warnings

Signed-off-by: zethson <[email protected]>

* Submodules

Signed-off-by: zethson <[email protected]>

---------

Signed-off-by: zethson <[email protected]>

* Add PerturbationDataValidator (#672)

* Augur scsim warnings

Signed-off-by: zethson <[email protected]>

* Submodules

Signed-off-by: zethson <[email protected]>

* Add super draft of pertpy validator

Signed-off-by: zethson <[email protected]>

* Polish

Signed-off-by: zethson <[email protected]>

* Polish

Signed-off-by: zethson <[email protected]>

* Nested try

Signed-off-by: zethson <[email protected]>

* validator in test

Signed-off-by: zethson <[email protected]>

* try uv for rtd

Signed-off-by: zethson <[email protected]>

* rtd uv

Signed-off-by: zethson <[email protected]>

* rtd uv

Signed-off-by: zethson <[email protected]>

* rtd uv fix

Signed-off-by: zethson <[email protected]>

* mb sphinx fix for validator

Signed-off-by: zethson <[email protected]>

* docs

Signed-off-by: zethson <[email protected]>

* remove PerturbationValidator from docs

Signed-off-by: zethson <[email protected]>

* remove PerturbationValidator from docs

Signed-off-by: zethson <[email protected]>

---------

Signed-off-by: zethson <[email protected]>

* Latest OS for RTD

* Remove curator again

Signed-off-by: zethson <[email protected]>

* Fix jax random array (#686)

* Fix jax random array

Signed-off-by: zethson <[email protected]>

* Fix further jax warnings

Signed-off-by: zethson <[email protected]>

* Fix edger

Signed-off-by: zethson <[email protected]>

* Fix choice

Signed-off-by: zethson <[email protected]>

---------

Signed-off-by: zethson <[email protected]>

* Switch to formulaic-contrasts (#682)

* Switch to formulaic-contrasts

* Cleanup

* removing design matrix workaround (#691)

Co-authored-by: Emma Dann <[email protected]>

* Fix PyDESeq2

* Update tests

* fix typo in gitignore

* Remove contrast dataclass, which isnt used anywhere

* Fix edgeR rpy2 tests (#692)

* fix broken rpy2 edger tests

* updated edger tests

* Fix tests (scipy)

Signed-off-by: zethson <[email protected]>

* submodule

Signed-off-by: zethson <[email protected]>

* Remove unused code

Signed-off-by: zethson <[email protected]>

* type hints

Signed-off-by: zethson <[email protected]>

---------

Signed-off-by: zethson <[email protected]>
Co-authored-by: Emma Dann <[email protected]>
Co-authored-by: Emma Dann <[email protected]>
Co-authored-by: zethson <[email protected]>

* Release 0.9.5

Signed-off-by: zethson <[email protected]>

* Prepare 0.10.0

Signed-off-by: zethson <[email protected]>

* Added Mixscape seeds and test (#683)

Co-authored-by: Lukas Heumos <[email protected]>

* Fix probability data type (#696)

Signed-off-by: Lukas Heumos <[email protected]>

* Optimize MeanVarDistributionDistance (#697)

* Fix probability data type

Signed-off-by: Lukas Heumos <[email protected]>

* Optimize mean_var distance

Signed-off-by: Lukas Heumos <[email protected]>

---------

Signed-off-by: Lukas Heumos <[email protected]>

* Optimize test speed (#699)

* Try buildjet

Signed-off-by: Lukas Heumos <[email protected]>

* Try buildjet large

Signed-off-by: Lukas Heumos <[email protected]>

* speed up predict_differential_prioritization

Signed-off-by: Lukas Heumos <[email protected]>

* speed up tests

Signed-off-by: Lukas Heumos <[email protected]>

---------

Signed-off-by: Lukas Heumos <[email protected]>

* Lower bound for scikit-learn (#701)

Signed-off-by: Lukas Heumos <[email protected]>

* Fix type annotation

Signed-off-by: Lukas Heumos <[email protected]>

* Fix empty figure returns when show=True in plotting functions (#703)

* Removed show parameter

* Adapt plotting API for Augur, Coda, Dialogue

* Adapted plotting API for Milo, Mixscape, scgen

* Add joblib

* Remove joblib

---------

Co-authored-by: Lukas Heumos <[email protected]>

* Fix scikit-learn intendation

Signed-off-by: Lukas Heumos <[email protected]>

---------

Signed-off-by: zethson <[email protected]>
Signed-off-by: Lukas Heumos <[email protected]>
Co-authored-by: Lilly May <[email protected]>
Co-authored-by: Lukas Heumos <[email protected]>
Co-authored-by: Gregor Sturm <[email protected]>
Co-authored-by: Emma Dann <[email protected]>
Co-authored-by: Emma Dann <[email protected]>

* Refactor guide assignment logic and enhance mixture model parameters

* Cleanup MixtureModel class

* Enhance guide assignment validation and error handling in GuideAssignment class

* Update dev nb

* Add test for grna_mixture_model

* Remove dev nb

* Update notebook for guide assignment

* Update guide assignment notebooks

* Apply suggestions from code review

Review comments by @Zethson

Co-authored-by: Lukas Heumos <[email protected]>

* Improve code to fit review suggestions
- Added lots of type hints and return types
- Improved naming of variables
- Added and removed a few comments
- Added user warnings if a guide is not expressed at all

* Fix sloppy data dimensions for numpyro
Previously data was (N,1) dim. Now applying ravel, and changed numpyro plates accordingly for correct batching.

* Update test_grna_assignment.py
We changed "Negative" to "negative" :)

* Polish

Signed-off-by: Lukas Heumos <[email protected]>

* Polish

Signed-off-by: Lukas Heumos <[email protected]>

---------

Signed-off-by: zethson <[email protected]>
Signed-off-by: Lukas Heumos <[email protected]>
Co-authored-by: Lilly May <[email protected]>
Co-authored-by: Lukas Heumos <[email protected]>
Co-authored-by: Gregor Sturm <[email protected]>
Co-authored-by: Emma Dann <[email protected]>
Co-authored-by: Emma Dann <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants