Skip to content

Commit b583ee1

Browse files
authored
Merge pull request #38 from sbslee/1.13.0-dev
1.13.0 dev
2 parents b4c045d + 0d6964b commit b583ee1

File tree

11 files changed

+444
-6
lines changed

11 files changed

+444
-6
lines changed

CHANGELOG.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Changelog
22
*********
33

4+
1.13.0 (2022-04-02)
5+
-------------------
6+
7+
* :issue:`37`: Add new methods :meth:`cross_association_table`, :meth:`cross_association_heatmap`, and :meth:`cross_association_regplot`.
8+
49
1.12.0 (2022-02-11)
510
-------------------
611

data/miscellaneous/lipids.csv

Lines changed: 45 additions & 0 deletions
Large diffs are not rendered by default.

data/miscellaneous/otu.csv

Lines changed: 45 additions & 0 deletions
Large diffs are not rendered by default.

docs/conf.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
'scipy',
4545
'matplotlib',
4646
'seaborn',
47-
'skbio'
47+
'skbio',
48+
'statsmodels',
4849
]
4950

5051
issues_github_path = 'sbslee/dokdo'

docs/dokdo_api.rst

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,13 @@ As expected, above gives the same result as using the Visualization file created
329329
General Methods
330330
===============
331331

332+
cross_association_table
333+
-----------------------
334+
335+
.. currentmodule:: dokdo.api.cross_association
336+
337+
.. autofunction:: cross_association_table
338+
332339
get_mf
333340
------
334341

@@ -479,6 +486,20 @@ clustermap
479486

480487
.. autofunction:: clustermap
481488

489+
cross_association_heatmap
490+
-------------------------
491+
492+
.. currentmodule:: dokdo.api.cross_association
493+
494+
.. autofunction:: cross_association_heatmap
495+
496+
cross_association_regplot
497+
-------------------------
498+
499+
.. currentmodule:: dokdo.api.cross_association
500+
501+
.. autofunction:: cross_association_regplot
502+
482503
regplot
483504
-------
484505

121 KB
Loading
15.8 KB
Loading

dokdo/api/__init__.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
from .distance_matrix_plot import distance_matrix_plot
1616
from .taxa_abundance import taxa_abundance_bar_plot, taxa_abundance_box_plot
1717
from .ancom_volcano_plot import ancom_volcano_plot
18+
from .cross_association import cross_association_table, cross_association_heatmap, cross_association_regplot
1819

1920
from .addsig import addsig
2021
from .addpairs import addpairs
@@ -28,5 +29,6 @@
2829
'alpha_rarefaction_plot', 'beta_2d_plot', 'beta_3d_plot',
2930
'beta_scree_plot', 'beta_parallel_plot', 'distance_matrix_plot',
3031
'taxa_abundance_bar_plot', 'taxa_abundance_box_plot',
31-
'ancom_volcano_plot', 'addsig', 'regplot', 'addbiplot',
32-
'ordinate', 'pname', 'get_mf']
32+
'ancom_volcano_plot', 'cross_association_table',
33+
'cross_association_heatmap', 'cross_association_regplot',
34+
'addsig', 'regplot', 'addbiplot', 'ordinate', 'pname', 'get_mf']

dokdo/api/common.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def pname(name, levels=None):
116116
.. code:: python3
117117
118118
import dokdo
119-
119+
120120
dokdo.pname('d__Bacteria;p__Actinobacteriota;c__Actinobacteria;o__Actinomycetales;f__Actinomycetaceae;g__Actinomyces;s__Schaalia_radingae')
121121
# Will print: 's__Schaalia_radingae'
122122
@@ -139,7 +139,7 @@ def pname(name, levels=None):
139139
return rank
140140
if rank == '__':
141141
continue
142-
if rank.split('__')[1] is '':
142+
if not rank.split('__')[1]:
143143
return ranks[i+1] + ';' + rank
144144
return rank
145145
else:

0 commit comments

Comments
 (0)