Add option to use connectivities for WOT #609
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## dev #609 +/- ##
==========================================
+ Coverage 84.48% 85.71% +1.22%
==========================================
Files 65 65
Lines 8097 8149 +52
==========================================
+ Hits 6841 6985 +144
+ Misses 1256 1164 -92
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
Marius1311
approved these changes
Jun 8, 2021
6 tasks
michalk8
added a commit
that referenced
this pull request
Jun 30, 2021
* Smoothing for Pseudotime kernel (#514) * Rename PalantirKernel -> PseudotimeKernel * Add initial abstraction * Add Palantir scheme * Add soft PT * Remove old test * Fix wrong condition * Update docs and defaults * Fix Pseudotime kernel docstring * Fix more docstrings * Update docs * Add tests, pin down numba Co-authored-by: Marius Lange <marius.lange@t-online.de> * Add compute_projection (#520) * Add compute_projection * Swap order of args * Add tests * Fix params, add plotting test * [ci skip] Update docstring * Pin down numba Co-authored-by: Marius Lange <marius.lange@t-online.de> * Fix bugs, QoL improvements (#535) * Fix bugs, QoL improvements * Add QoL changes v2 * Enable CI * Cytotrace kernel (#527) * Add CytoTRACE kernel * Add new kernel to docs * Fix literal * Work on the docstring * Rename variables * Rename the gcs variable * Update the docstring * Add docstring to kernel class * Move the workflow example * [ci skip] Enable CI * Move to CytoTRACEKernel * Improve logging, remove arbitrary restriction * Do not use short kernel names * Add CytoTRACE test skeletons * Set use_raw=False, add tests * Improve tests * Fix raw and normal adata with different n_vars * Add cytotrace score to adata_200 * Add regression test for ct_score * Add regression test for gene_corr * Fix tests Co-authored-by: Marius Lange <marius.lange@t-online.de> * Add external model (#522) * Add external module, port statOT * Add docs * Add typing_extensions * Add some sanity check * Move external to separate page * Add tests * Temp. pin down numba * Add explicit POT mention in docs, add to external * Use raise from * Fix init subclass * Add rest error mixins * Add tox * Update CONTRIBUTING.rst * Update CONTRIBUTING.rst * Fix sections * Update CONTRIBUTING.rst * Update test requirements * [ci skip] Start addressing comments * [ci skip] Update CONTRIBUTING.rst * Add tutorials to CONTRIBUTING.rst * Different import, enable CI on dev * Update GA issues/discussions * Update OTKernel to reflect new changes * Fix wrong import * [ci skip] Update dev install, docs * [ci skip] Fix link * Remove edit_on_github (#538) * Random walk simulation (#537) * Add random walk class * Parallelize * Random walk plotting * Add docstrings * [ci skip] Fix some imports * [ci skip] Add error messages * Add random walks test skeleton * [ci skip] Add plotting test skeletons * Add RW tests * Add plotting tests * Add legend loc for start/stop indices, update docs * Work on docstrings * Add first/last cell description Co-authored-by: Marius Lange <marius.lange@t-online.de> * Fix dist -> conn, update docstrings, remove copy (#536) * Fix dist -> conn, update docstrings, remove copy * Change default * Work on the docstring * Exchange k for fract_to_keep * Make fract_to_keep a float * Fix tests Co-authored-by: Marius Lange <marius.lange@t-online.de> * Fix plot lin drivers (#543) * Fix lineage drivers plotting * Add tests * Add forgotten GT images * Fix nan in emb when projection tmat (#546) * [ci skip] Add Zebrafish dataset (#547) * [ci skip] Remove fig.show() * Fix some logging messages * Release notes 1.3 (#539) * Fix docs, move latest additions * Change latest to stable * Add most of the release notes * [ci skip] Update release notes - new dataset * Go over release notes * Update release notes: move Zebrafish, add pygpcca * Correct tutorial names * Regenerate some figures to accomodate mpl==1.4.0 Co-authored-by: Marius Lange <marius.lange@t-online.de> * Release 1.3 (#548) * Fix typos, update _static * Add forgotten docstring to abstract method * Fix tutorial links in docs * Update the index * Make it a bit shorter * Add links and contributions seciton * Fix spelling * Fix same plot (#556) * Fix reading from adata * Regenerate figure * Add warning * Compute Schur only for num. states, not +1 * Add test * Update README.rst * Minor update * Remove solver heuristics (#558) * Remove solver/PETSc heuristic * Change tol to 1e-6 * Change test tol, regen image * Add check probs sum to 1 (#566) * Add abs. probs check * Add nicer message, add tests * Increase tolerance to 1e-3 * Fix test * [ci skip] Fix test names * Fix not using percentile (#568) * Fix wrong pyGPCCA attribute in logging * First version of req. pruning (#571) * Fix inconsistent state (#563) * Fix inconsistent cat/cont macrostates/lineages * Add tests, fix 1 minor bug * Add force recompute tmat (#577) * Add force tmat recomputation, fix typo bug * Add test * Change circ. projection TSP default heuristic * Remove -1 in hard scheme, modify test (#582) * [ci skip] Remove sphinx-paramlinks (#584) * Pt kernel changes (#583) * Change PT kernel defaults, remove perc/dnorm * Remove density normalize from tests * Fix docs * [ci skip] Remove sphinx-paramlinks * Fix test * Remove dens correction from docstring * Dont force sparse tmat if already dense (#586) * Do not force tmat to be sparse * Add test * Fix tests expecting sparse matrix * Parallelize pt kernel (#587) * Parallelize PT kernel * [ci skip] Add forgotten kwargs in docs * Fix custom connectivities key (#590) * Fix plot_coarse_T annotation * Exp time kernel (#595) * Resurrect exp. time kernel * Add WOT skeleton class * Add WOT * Add tests, add wot to external requirements * Skip WOT tests on CI, update WOT installation * Better import error message, save tmats, last 1s * Clear order info message, fix test skip * Expose more args * Save estimated growth rates to adata * [ci skip] Add compute_initial_growth_rates * Add to the docstrings * Add HVGs subset, fix docs, rename StatOT kernel * Change debug to info, add uniform * Add example workflow * [ci skip] Polish docs Co-authored-by: Marius Lange <marius.lange@t-online.de> * Wot kernel graph (#600) * Don't require connectivities for external kernels * Fix commented skip * Enable bibtex (#601) * Use bibtex for references * Polish docs * Fix dois * Update CytoTRACE workflow * Update WOT example workflow * Remove old examples, add new skeleton ones (#602) * Remove old examples, add new skeleton ones * Move old release notes * Add 2 new examples - projection and RW * Update latest additions * Update RW docstring * Update docstring to manually set terminal states (#607) * Update docstring to manually set terminal states * Fix bug with doc insertion * Add option to set term states from clusters Co-authored-by: Michal Klein <michal.klein@protonmail.com> * Add option to use connectivities for WOT (#609) * Fix tqdm/ipywidgets (#616) * Vein plot (#615) * Start vein plot * Specialize plot_flow for exp. time kernel * Add first working impl. * Update plotting * Add plotting options * Add flow threshold * Rename argument * Fix cyclic import * Fix plot_flow in ExpTimeKernel * Add tmat kernel * Subset clusters, fix bwd * Allow cluster subset and ordering * Add time point filtering * [ci skip] Fix bugs, start abstraction * [ci skip] Clean code * [ci skip] Remove dicts * [ci skip] Fix indexing error * Remove plot_flow specification for TMatKernel * [ci skip] Control ticks * [ci skip] Order legend * Polish docs * Polish docs * Add option to remove empty clusters * Fix linting * [ci skip] Fix logging and docs * Add skeleton tests, fix typo, name to single flow * Add first batch of tests * Add plotting tests * [ci skip] Fix doi * [ci skip] Fix exp. time kernel copy (#623) * Fix lineage drivers to allow for combinations (#624) * Fix parallelize too many jobs (#633) * Cluster lin clusters (#634) * [ci skip] Add cluster key to cluster_lineage * Fix limits * Use more xticks * Add multiple covariates, expose ratio and cmap * Add tests * Add WOT dataset infra (#631) * Add WOT dataset infra * Add figshare link * Fix indentation in docs, missing dot. Co-authored-by: Marius Lange <marius.lange@t-online.de> * Increate timeout * Prolif apop markers (#630) * Add marker fetching class * Add prolif/apop infra * Remove rat * Add human markers * Add mouse markers * Add references * Add test * Minor dosctring changes Co-authored-by: Marius Lange <marius.lange@t-online.de> * Speed up calculation of absorption probabilities (#638) * Refactor `compute_absorption_probabilities` Refactors the calculation of absorption probabilities to first define a single artificial cell in the macro state by summing all cells identifying the macro state. This is equivalent to solving the linear system for each individual cell and then summing the absorption probabilities. * Update test_cflare.py Updates `TestCFLARE.test_abs_probs_negative` to work correctly with the refactored version of `BaseEstimator.compute_absorption_probabilities`. Co-authored-by: michalk8 <46717574+michalk8@users.noreply.github.com> * Stacked histogram (#641) * Add plot macrostate composition * Set margins * Fix cyclic import * Add test skeletons * Add tests * Remove return ax test * Set yticks * Regenerate figures Co-authored-by: Marius Lange <marius.lange@t-online.de> * Log odds (#642) * Initialize log_odds * Move Marius' function * Implement log odds * Add docs, fix TODOs * Add test skeletons * Add colorbar * Add legend_loc * Fix categorical bug, jitter, seed, add tests * Remove testing artifact * Fix copy * Change threshold * Add show * Add key-specific threshold * Add fontsize * Add xticks step size * Add tests, fix tick step size None * Change verbosity to debug * Add plot gene corr (#640) * Add plot gene corr * Add test skeletons * Add tests, fix raw bug * Fix adjustText * Change defaults, ERROR logging * Fix using wrong params Co-authored-by: Marius Lange <marius.lange@t-online.de> * Update precommit (#645) * Update precommit * Update reqs, setup.py, pyproject.toml * Install Cython for 3.9 * Install Cython v2 * POT v3 * Try latest numba version * Disable 3.9 CI * Try installing umap-learn on CI/tox * Fix macOS, docs umap-learn version * Fix docs build * Add some references * Update release notes (#647) * Update release notes * Pin numba in reqs again * Update test reqs., CI Python hash * Purge CI cache * Remove 3.9 CI * Add links to index.rst * Finalize release notes * Fix reference, add missing doi, download notebook Co-authored-by: Marius Lange <marius.lange@t-online.de> Co-authored-by: Marius Lange <marius.lange@t-online.de> Co-authored-by: Marius Lange <marius.lange@tum.de> Co-authored-by: Philipp Weiler <philipp.weiler@tum.de>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
IMPORTANT: Please search among the Pull request before creating one.
Title
Types of changes
Description
Add option to WOT kernel to use transition derived from ConnectivityKernel for the last time point.
How has this been tested?
Modified existing test.
Closes
closes #608