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

fix extraction of corf_loc_names when dmat is provided directly #174

Closed
wants to merge 17 commits into from
Closed

fix extraction of corf_loc_names when dmat is provided directly #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
43fb819
Merge pull request #97 from theislab/dev
davidsebfischer Aug 14, 2019
aad102e
Merge pull request #98 from theislab/dev
davidsebfischer Aug 14, 2019
062161d
Merge pull request #104 from theislab/dev
davidsebfischer Aug 21, 2019
5be8684
Merge pull request #105 from theislab/dev
davidsebfischer Aug 21, 2019
118a607
Merge pull request #106 from theislab/dev
davidsebfischer Aug 21, 2019
0249161
Merge pull request #107 from theislab/dev
davidsebfischer Aug 22, 2019
b2657b3
Merge pull request #110 from theislab/dev
davidsebfischer Aug 25, 2019
f8635bb
Merge pull request #111 from theislab/dev
davidsebfischer Aug 25, 2019
8b9ad60
Merge pull request #113 from theislab/dev
davidsebfischer Aug 26, 2019
b023a80
Fix versus_rest link
gokceneraslan Oct 7, 2019
c27eead
Remove whitespace
gokceneraslan Oct 7, 2019
dfe8304
Merge pull request #118 from gokceneraslan/patch-1
davidsebfischer Oct 8, 2019
51aaa49
Merge pull request #124 from theislab/dev
davidsebfischer Oct 31, 2019
b60bdb3
Merge branch 'dev' of https://github.com/theislab/diffxpy
davidsebfischer Feb 21, 2020
00f8a83
Merge pull request #138 from theislab/dev
davidsebfischer Feb 21, 2020
3689ea8
Merge pull request #147 from theislab/dev
davidsebfischer Mar 19, 2020
838ceb1
fix extraction of corf_loc_names when dmat is provided directly
le-ander Jul 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion diffxpy/testing/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,10 @@ def wald(
as_numeric=as_numeric
)
else:
coef_loc_names = dmat_loc.columns.tolist()
if isinstance(dmat_loc, patsy.design_info.DesignMatrix):
coef_loc_names = dmat_loc.design_info.column_names
else:
coef_loc_names = dmat_loc.columns.tolist()
if not np.all([x in coef_loc_names for x in coef_to_test]):
raise ValueError(
"the requested test coefficients %s were found in model coefficients %s" %
Expand Down
4 changes: 1 addition & 3 deletions docs/tutorials.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@ Diffxpy allows you to define a data set partition and to conduct test on each ge
Multiple tests per gene
~~~~~~~~~~~~~~~~~~~~~~~

How to perform `pairwise <https://nbviewer.jupyter.org/github/theislab/diffxpy_tutorials/tree/master/diffxpy_tutorials/test/multiple_tests_per_gene.ipynb>`__ tests.

How to perform group tests versus all other groups (versus `rest <https://nbviewer.jupyter.org/github/theislab/diffxpy_tutorials/tree/master/diffxpy_tutorials/test/multiversus_rest.ipynb>`__).
How to perform `pairwise tests, group versus rest tests and tests within each parition <https://nbviewer.jupyter.org/github/theislab/diffxpy_tutorials/tree/master/diffxpy_tutorials/test/multiple_tests_per_gene.ipynb>`__ tests.


Gene set enrichment: enrich
Expand Down