Skip to content

Commit c8911bf

Browse files
committed
1 parent 89809e9 commit c8911bf

7 files changed

+29
-29
lines changed

docs/dev/generated/skbio.diversity.alpha.faith_pd.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@
722722
<h1>skbio.diversity.alpha.faith_pd<a class="headerlink" href="#skbio-diversity-alpha-faith-pd" title="Link to this heading">#</a></h1>
723723
<dl class="py function">
724724
<dt class="sig sig-object py" id="skbio.diversity.alpha.faith_pd">
725-
<span class="sig-prename descclassname"><span class="pre">skbio.diversity.alpha.</span></span><span class="sig-name descname"><span class="pre">faith_pd</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">counts</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">taxa</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">tree</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">validate</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">True</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">otu_ids</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em><span class="sig-paren">)</span><a class="reference external" href="https://github.com/scikit-bio/scikit-bio/blob/main/skbio/diversity/alpha/_pd.py#L53"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#skbio.diversity.alpha.faith_pd" title="Link to this definition">#</a></dt>
725+
<span class="sig-prename descclassname"><span class="pre">skbio.diversity.alpha.</span></span><span class="sig-name descname"><span class="pre">faith_pd</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">counts</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">taxa</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">tree</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">validate</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">True</span></span></em><span class="sig-paren">)</span><a class="reference external" href="https://github.com/scikit-bio/scikit-bio/blob/main/skbio/diversity/alpha/_pd.py#L53"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#skbio.diversity.alpha.faith_pd" title="Link to this definition">#</a></dt>
726726
<dd><p>Calculate Faith’s phylogenetic diversity (Faith’s PD) metric.</p>
727727
<p>The Faith’s PD metric is defined as:</p>
728728
<div class="math notranslate nohighlight">
@@ -731,13 +731,16 @@ <h1>skbio.diversity.alpha.faith_pd<a class="headerlink" href="#skbio-diversity-a
731731
connect all taxa in a community. <span class="math notranslate nohighlight">\(R\)</span> is a set of branches from the lowest
732732
common ancestor (LCA) of the taxa to the root of the tree. <span class="math notranslate nohighlight">\(PD\)</span> is the sum of
733733
lengths (<span class="math notranslate nohighlight">\(l\)</span>) of branches in both sets.</p>
734-
<dl class="field-list simple">
734+
<dl class="field-list">
735735
<dt class="field-odd">Parameters<span class="colon">:</span></dt>
736-
<dd class="field-odd"><dl class="simple">
736+
<dd class="field-odd"><dl>
737737
<dt><strong>counts</strong><span class="classifier">1-D array_like, int</span></dt><dd><p>Vectors of counts/abundances of taxa for one sample.</p>
738738
</dd>
739739
<dt><strong>taxa</strong><span class="classifier">list, np.array</span></dt><dd><p>Vector of taxon IDs corresponding to tip names in <code class="docutils literal notranslate"><span class="pre">tree</span></code>. Must be the same
740740
length as <code class="docutils literal notranslate"><span class="pre">counts</span></code>. Required.</p>
741+
<div class="versionchanged">
742+
<p><span class="versionmodified changed">Changed in version 0.6.0: </span>Renamed from <code class="docutils literal notranslate"><span class="pre">otu_ids</span></code>. The old name is kept as an alias but is deprecated.</p>
743+
</div>
741744
</dd>
742745
<dt><strong>tree</strong><span class="classifier">skbio.TreeNode</span></dt><dd><p>Tree relating taxa. The set of tip names in the tree can be a superset of
743746
<code class="docutils literal notranslate"><span class="pre">taxa</span></code>, but not a subset. Required.</p>
@@ -749,9 +752,6 @@ <h1>skbio.diversity.alpha.faith_pd<a class="headerlink" href="#skbio-diversity-a
749752
are valid. See <a class="reference internal" href="../diversity.html#module-skbio.diversity" title="skbio.diversity"><code class="xref py py-mod docutils literal notranslate"><span class="pre">skbio.diversity</span></code></a> for the description of what validation
750753
entails so you can determine if you can safely disable validation.</p>
751754
</dd>
752-
<dt><strong>otu_ids</strong><span class="classifier">list, np.array</span></dt><dd><p>Alias of <code class="docutils literal notranslate"><span class="pre">taxa</span></code> for backward compatibility. Deprecated and to be removed in a
753-
future release.</p>
754-
</dd>
755755
</dl>
756756
</dd>
757757
<dt class="field-even">Returns<span class="colon">:</span></dt>

docs/dev/generated/skbio.diversity.alpha.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ <h2>Richness metrics<a class="headerlink" href="#richness-metrics" title="Link t
741741
<tr class="row-even"><td><p><a class="reference internal" href="skbio.diversity.alpha.doubles.html#skbio.diversity.alpha.doubles" title="skbio.diversity.alpha.doubles"><code class="xref py py-obj docutils literal notranslate"><span class="pre">doubles</span></code></a>(counts)</p></td>
742742
<td><p>Calculate number of double-occurrence taxa (doubletons).</p></td>
743743
</tr>
744-
<tr class="row-odd"><td><p><a class="reference internal" href="skbio.diversity.alpha.faith_pd.html#skbio.diversity.alpha.faith_pd" title="skbio.diversity.alpha.faith_pd"><code class="xref py py-obj docutils literal notranslate"><span class="pre">faith_pd</span></code></a>(counts[, taxa, tree, validate, otu_ids])</p></td>
744+
<tr class="row-odd"><td><p><a class="reference internal" href="skbio.diversity.alpha.faith_pd.html#skbio.diversity.alpha.faith_pd" title="skbio.diversity.alpha.faith_pd"><code class="xref py py-obj docutils literal notranslate"><span class="pre">faith_pd</span></code></a>(counts, taxa, tree[, validate])</p></td>
745745
<td><p>Calculate Faith's phylogenetic diversity (Faith's PD) metric.</p></td>
746746
</tr>
747747
<tr class="row-even"><td><p><a class="reference internal" href="skbio.diversity.alpha.margalef.html#skbio.diversity.alpha.margalef" title="skbio.diversity.alpha.margalef"><code class="xref py py-obj docutils literal notranslate"><span class="pre">margalef</span></code></a>(counts)</p></td>
@@ -796,7 +796,7 @@ <h2>Diversity metrics<a class="headerlink" href="#diversity-metrics" title="Link
796796
<tr class="row-even"><td><p><a class="reference internal" href="skbio.diversity.alpha.kempton_taylor_q.html#skbio.diversity.alpha.kempton_taylor_q" title="skbio.diversity.alpha.kempton_taylor_q"><code class="xref py py-obj docutils literal notranslate"><span class="pre">kempton_taylor_q</span></code></a>(counts[, lower_quantile, ...])</p></td>
797797
<td><p>Calculate Kempton-Taylor Q index of alpha diversity.</p></td>
798798
</tr>
799-
<tr class="row-odd"><td><p><a class="reference internal" href="skbio.diversity.alpha.phydiv.html#skbio.diversity.alpha.phydiv" title="skbio.diversity.alpha.phydiv"><code class="xref py py-obj docutils literal notranslate"><span class="pre">phydiv</span></code></a>(counts[, taxa, tree, rooted, weight, ...])</p></td>
799+
<tr class="row-odd"><td><p><a class="reference internal" href="skbio.diversity.alpha.phydiv.html#skbio.diversity.alpha.phydiv" title="skbio.diversity.alpha.phydiv"><code class="xref py py-obj docutils literal notranslate"><span class="pre">phydiv</span></code></a>(counts, taxa, tree[, rooted, weight, ...])</p></td>
800800
<td><p>Calculate generalized phylogenetic diversity (PD) metrics.</p></td>
801801
</tr>
802802
<tr class="row-even"><td><p><a class="reference internal" href="skbio.diversity.alpha.renyi.html#skbio.diversity.alpha.renyi" title="skbio.diversity.alpha.renyi"><code class="xref py py-obj docutils literal notranslate"><span class="pre">renyi</span></code></a>(counts[, order, base])</p></td>

docs/dev/generated/skbio.diversity.alpha.phydiv.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -722,15 +722,18 @@
722722
<h1>skbio.diversity.alpha.phydiv<a class="headerlink" href="#skbio-diversity-alpha-phydiv" title="Link to this heading">#</a></h1>
723723
<dl class="py function">
724724
<dt class="sig sig-object py" id="skbio.diversity.alpha.phydiv">
725-
<span class="sig-prename descclassname"><span class="pre">skbio.diversity.alpha.</span></span><span class="sig-name descname"><span class="pre">phydiv</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">counts</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">taxa</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">tree</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">rooted</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">weight</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">False</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">validate</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">True</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">otu_ids</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em><span class="sig-paren">)</span><a class="reference external" href="https://github.com/scikit-bio/scikit-bio/blob/main/skbio/diversity/alpha/_pd.py#L248"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#skbio.diversity.alpha.phydiv" title="Link to this definition">#</a></dt>
725+
<span class="sig-prename descclassname"><span class="pre">skbio.diversity.alpha.</span></span><span class="sig-name descname"><span class="pre">phydiv</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">counts</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">taxa</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">tree</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">rooted</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">weight</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">False</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">validate</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">True</span></span></em><span class="sig-paren">)</span><a class="reference external" href="https://github.com/scikit-bio/scikit-bio/blob/main/skbio/diversity/alpha/_pd.py#L244"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#skbio.diversity.alpha.phydiv" title="Link to this definition">#</a></dt>
726726
<dd><p>Calculate generalized phylogenetic diversity (PD) metrics.</p>
727-
<dl class="field-list simple">
727+
<dl class="field-list">
728728
<dt class="field-odd">Parameters<span class="colon">:</span></dt>
729-
<dd class="field-odd"><dl class="simple">
729+
<dd class="field-odd"><dl>
730730
<dt><strong>counts</strong><span class="classifier">1-D array_like, int</span></dt><dd><p>Vectors of counts/abundances of taxa for one sample.</p>
731731
</dd>
732732
<dt><strong>taxa</strong><span class="classifier">list, np.array</span></dt><dd><p>Vector of taxon IDs corresponding to tip names in <code class="docutils literal notranslate"><span class="pre">tree</span></code>. Must be the same
733733
length as <code class="docutils literal notranslate"><span class="pre">counts</span></code>. Required.</p>
734+
<div class="versionchanged">
735+
<p><span class="versionmodified changed">Changed in version 0.6.0: </span>Renamed from <code class="docutils literal notranslate"><span class="pre">otu_ids</span></code>. The old name is kept as an alias but is deprecated.</p>
736+
</div>
734737
</dd>
735738
<dt><strong>tree</strong><span class="classifier">skbio.TreeNode</span></dt><dd><p>Tree relating taxa. The set of tip names in the tree can be a superset of
736739
<code class="docutils literal notranslate"><span class="pre">taxa</span></code>, but not a subset. Required.</p>
@@ -745,9 +748,6 @@ <h1>skbio.diversity.alpha.phydiv<a class="headerlink" href="#skbio-diversity-alp
745748
</dd>
746749
<dt><strong>validate</strong><span class="classifier">bool, optional</span></dt><dd><p>Whether validate the input data. See <a class="reference internal" href="skbio.diversity.alpha.faith_pd.html#skbio.diversity.alpha.faith_pd" title="skbio.diversity.alpha.faith_pd"><code class="xref py py-func docutils literal notranslate"><span class="pre">faith_pd</span></code></a> for details.</p>
747750
</dd>
748-
<dt><strong>otu_ids</strong><span class="classifier">list, np.array</span></dt><dd><p>Alias of <code class="docutils literal notranslate"><span class="pre">taxa</span></code> for backward compatibility. Deprecated and to be removed in a
749-
future release.</p>
750-
</dd>
751751
</dl>
752752
</dd>
753753
<dt class="field-even">Returns<span class="colon">:</span></dt>

docs/dev/generated/skbio.diversity.beta.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -687,10 +687,10 @@
687687
<h2>Functions<a class="headerlink" href="#functions" title="Link to this heading">#</a></h2>
688688
<div class="pst-scrollable-table-container"><table class="autosummary longtable table autosummary">
689689
<tbody>
690-
<tr class="row-odd"><td><p><a class="reference internal" href="skbio.diversity.beta.unweighted_unifrac.html#skbio.diversity.beta.unweighted_unifrac" title="skbio.diversity.beta.unweighted_unifrac"><code class="xref py py-obj docutils literal notranslate"><span class="pre">unweighted_unifrac</span></code></a>(u_counts, v_counts[, ...])</p></td>
690+
<tr class="row-odd"><td><p><a class="reference internal" href="skbio.diversity.beta.unweighted_unifrac.html#skbio.diversity.beta.unweighted_unifrac" title="skbio.diversity.beta.unweighted_unifrac"><code class="xref py py-obj docutils literal notranslate"><span class="pre">unweighted_unifrac</span></code></a>(u_counts, v_counts, taxa, ...)</p></td>
691691
<td><p>Compute unweighted UniFrac.</p></td>
692692
</tr>
693-
<tr class="row-even"><td><p><a class="reference internal" href="skbio.diversity.beta.weighted_unifrac.html#skbio.diversity.beta.weighted_unifrac" title="skbio.diversity.beta.weighted_unifrac"><code class="xref py py-obj docutils literal notranslate"><span class="pre">weighted_unifrac</span></code></a>(u_counts, v_counts[, taxa, ...])</p></td>
693+
<tr class="row-even"><td><p><a class="reference internal" href="skbio.diversity.beta.weighted_unifrac.html#skbio.diversity.beta.weighted_unifrac" title="skbio.diversity.beta.weighted_unifrac"><code class="xref py py-obj docutils literal notranslate"><span class="pre">weighted_unifrac</span></code></a>(u_counts, v_counts, taxa, tree)</p></td>
694694
<td><p>Compute weighted UniFrac with or without branch length normalization.</p></td>
695695
</tr>
696696
</tbody>

0 commit comments

Comments
 (0)