Skip to content

Commit a78d9d4

Browse files
committed
1 parent 7b2ba8d commit a78d9d4

26 files changed

+247
-306
lines changed

docs/dev/generated/skbio.sequence.SubstitutionMatrix.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,7 @@ <h1>skbio.sequence.SubstitutionMatrix<a class="headerlink" href="#skbio-sequence
909909
<td><p>Filter the matrix by IDs.</p></td>
910910
</tr>
911911
<tr class="row-odd"><td><p><a class="reference internal" href="skbio.stats.distance.PairwiseMatrix.from_iterable.html#skbio.stats.distance.PairwiseMatrix.from_iterable" title="skbio.stats.distance.PairwiseMatrix.from_iterable"><code class="xref py py-obj docutils literal notranslate"><span class="pre">from_iterable</span></code></a>(iterable, metric[, key, keys])</p></td>
912-
<td><p>Create PairwiseMatrix from an iterable given a metric.</p></td>
912+
<td><p>Create a pairwise matrix from an iterable of objects given a metric.</p></td>
913913
</tr>
914914
<tr class="row-even"><td><p><a class="reference internal" href="skbio.stats.distance.PairwiseMatrix.index.html#skbio.stats.distance.PairwiseMatrix.index" title="skbio.stats.distance.PairwiseMatrix.index"><code class="xref py py-obj docutils literal notranslate"><span class="pre">index</span></code></a>(lookup_id)</p></td>
915915
<td><p>Return the index of the specified ID.</p></td>
@@ -927,7 +927,7 @@ <h1>skbio.sequence.SubstitutionMatrix<a class="headerlink" href="#skbio-sequence
927927
<td><p>Rename IDs in the matrix.</p></td>
928928
</tr>
929929
<tr class="row-odd"><td><p><a class="reference internal" href="skbio.stats.distance.PairwiseMatrix.to_data_frame.html#skbio.stats.distance.PairwiseMatrix.to_data_frame" title="skbio.stats.distance.PairwiseMatrix.to_data_frame"><code class="xref py py-obj docutils literal notranslate"><span class="pre">to_data_frame</span></code></a>()</p></td>
930-
<td><p>Create a <code class="docutils literal notranslate"><span class="pre">pandas.DataFrame</span></code> from this <code class="docutils literal notranslate"><span class="pre">PairwiseMatrix</span></code>.</p></td>
930+
<td><p>Create a pandas DataFrame from this matrix.</p></td>
931931
</tr>
932932
<tr class="row-even"><td><p><a class="reference internal" href="skbio.stats.distance.PairwiseMatrix.transpose.html#skbio.stats.distance.PairwiseMatrix.transpose" title="skbio.stats.distance.PairwiseMatrix.transpose"><code class="xref py py-obj docutils literal notranslate"><span class="pre">transpose</span></code></a>()</p></td>
933933
<td><p>Return the transpose of the matrix.</p></td>

docs/dev/generated/skbio.stats.distance.DistanceMatrix.condensed_form.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@
703703
<h1>skbio.stats.distance.DistanceMatrix.condensed_form<a class="headerlink" href="#skbio-stats-distance-distancematrix-condensed-form" title="Link to this heading">#</a></h1>
704704
<dl class="py method">
705705
<dt class="sig sig-object py" id="skbio.stats.distance.DistanceMatrix.condensed_form">
706-
<span class="sig-prename descclassname"><span class="pre">DistanceMatrix.</span></span><span class="sig-name descname"><span class="pre">condensed_form</span></span><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="reference external" href="https://github.com/scikit-bio/scikit-bio/blob/main/skbio/stats/distance/_base.py#L1826"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#skbio.stats.distance.DistanceMatrix.condensed_form" title="Link to this definition">#</a></dt>
706+
<span class="sig-prename descclassname"><span class="pre">DistanceMatrix.</span></span><span class="sig-name descname"><span class="pre">condensed_form</span></span><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="reference external" href="https://github.com/scikit-bio/scikit-bio/blob/main/skbio/stats/distance/_base.py#L1803"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#skbio.stats.distance.DistanceMatrix.condensed_form" title="Link to this definition">#</a></dt>
707707
<dd><p>Return an array of distances in condensed format.</p>
708708
<dl class="field-list simple">
709709
<dt class="field-odd">Returns<span class="colon">:</span></dt>

docs/dev/generated/skbio.stats.distance.DistanceMatrix.html

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -700,32 +700,32 @@
700700
<h1>skbio.stats.distance.DistanceMatrix<a class="headerlink" href="#skbio-stats-distance-distancematrix" title="Link to this heading">#</a></h1>
701701
<dl class="py class">
702702
<dt class="sig sig-object py" id="skbio.stats.distance.DistanceMatrix">
703-
<em class="property"><span class="k"><span class="pre">class</span></span><span class="w"> </span></em><span class="sig-prename descclassname"><span class="pre">skbio.stats.distance.</span></span><span class="sig-name descname"><span class="pre">DistanceMatrix</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">data</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">ids</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">condensed</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">diagonal</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/stats/distance/_base.py#L1737"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#skbio.stats.distance.DistanceMatrix" title="Link to this definition">#</a></dt>
703+
<em class="property"><span class="k"><span class="pre">class</span></span><span class="w"> </span></em><span class="sig-prename descclassname"><span class="pre">skbio.stats.distance.</span></span><span class="sig-name descname"><span class="pre">DistanceMatrix</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">data</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">ids</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">condensed</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">diagonal</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/stats/distance/_base.py#L1714"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#skbio.stats.distance.DistanceMatrix" title="Link to this definition">#</a></dt>
704704
<dd><p>Store distances between objects.</p>
705-
<p>A <cite>DistanceMatrix</cite> is a <cite>SymmetricMatrix</cite> with the additional
706-
requirement that the matrix data is hollow. There are additional methods
707-
made available that take advantage of this hollowness. The
708-
<a class="reference internal" href="skbio.stats.distance.PairwiseMatrix.plot.html#skbio.stats.distance.PairwiseMatrix.plot" title="skbio.stats.distance.PairwiseMatrix.plot"><code class="xref py py-func docutils literal notranslate"><span class="pre">plot</span></code></a> method provides
709-
convenient built-in plotting functionality.</p>
705+
<p>A <code class="docutils literal notranslate"><span class="pre">DistanceMatrix</span></code> is a <code class="docutils literal notranslate"><span class="pre">SymmetricMatrix</span></code> with the additional requirement that
706+
the matrix data is hollow (i.e., diagonal is zero). There are additional methods
707+
made available that take advantage of this hollowness.</p>
710708
<dl class="field-list simple">
711709
<dt class="field-odd">Parameters<span class="colon">:</span></dt>
712710
<dd class="field-odd"><dl class="simple">
713-
<dt><strong>data</strong><span class="classifier">array_like or PairwiseMatrix</span></dt><dd><p>Square, hollow, two-dimensional <code class="docutils literal notranslate"><span class="pre">numpy.ndarray</span></code> of distances
714-
(floats), or a structure that can be converted to a <code class="docutils literal notranslate"><span class="pre">numpy.ndarray</span></code>
715-
using <code class="docutils literal notranslate"><span class="pre">numpy.asarray</span></code> or a one-dimensional vector of distances
716-
(floats), as defined by <a class="reference external" href="https://docs.scipy.org/doc/scipy/reference/generated/scipy.spatial.distance.squareform.html">scipy.spatial.distance.squareform</a>.
717-
Can instead be a <cite>PairwiseMatrix</cite> (or <cite>DistanceMatrix</cite>) instance, in which case
718-
the instance’s data will be used. Data will be converted to a float <code class="docutils literal notranslate"><span class="pre">dtype</span></code>
719-
if necessary. A copy will <em>not</em> be made if already a <code class="docutils literal notranslate"><span class="pre">numpy.ndarray</span></code> with a
720-
float <code class="docutils literal notranslate"><span class="pre">dtype</span></code>.</p>
711+
<dt><strong>data</strong><span class="classifier">1-D or 2-D array_like, or PairwiseMatrix</span></dt><dd><p>A square 2-D array of pairwise distances between objects, or a 1-D array
712+
representing its condensed form. Can instead be an instance of
713+
<code class="docutils literal notranslate"><span class="pre">PairwiseMatrix</span></code> or its subclass, in which case its data and IDs will be
714+
directly used.</p>
721715
</dd>
722-
<dt><strong>ids</strong><span class="classifier">sequence of str, optional</span></dt><dd><p>Sequence of strings to be used as object IDs. Must match the number of
723-
rows/cols in <cite>data</cite>. If <code class="docutils literal notranslate"><span class="pre">None</span></code> (the default), IDs will be
724-
monotonically-increasing integers cast as strings, with numbering
725-
starting from zero, e.g., <code class="docutils literal notranslate"><span class="pre">('0',</span> <span class="pre">'1',</span> <span class="pre">'2',</span> <span class="pre">'3',</span> <span class="pre">...)</span></code>.</p>
716+
<dt><strong>ids</strong><span class="classifier">sequence of str, optional</span></dt><dd><p>IDs of the objects. Must match the number of rows/columns in <code class="docutils literal notranslate"><span class="pre">data</span></code>. If None
717+
(default) and <code class="docutils literal notranslate"><span class="pre">data</span></code> does not contain IDs, IDs will be
718+
monotonically-increasing integers cast as strings, starting from zero (i.e.,
719+
‘0’, ‘1’, ‘2’, ‘3’, …).</p>
726720
</dd>
727-
<dt><strong>validate</strong><span class="classifier">bool, optional</span></dt><dd><p>If <cite>validate</cite> is <code class="docutils literal notranslate"><span class="pre">True</span></code> (the default) and data is not a
728-
DistanceMatrix object, the input data will be validated.</p>
721+
<dt><strong>validate</strong><span class="classifier">bool, optional</span></dt><dd><p>If True (default) and <code class="docutils literal notranslate"><span class="pre">data</span></code> is not a <code class="docutils literal notranslate"><span class="pre">DistanceMatrix</span></code> object, the input
722+
data will be validated.</p>
723+
</dd>
724+
<dt><strong>condensed</strong><span class="classifier">bool, optional</span></dt><dd><p>Store the data in a 2-D redundant form (False, default) or a 1-D condensed form
725+
(True).</p>
726+
</dd>
727+
<dt><strong>diagonal</strong><span class="classifier">1-D array_like or float, optional</span></dt><dd><p>Values along the diagonal of the matrix. Must be zero. This parameter is a
728+
placeholder for interface compatibility with <code class="docutils literal notranslate"><span class="pre">SymmetricMatrix</span></code>.</p>
729729
</dd>
730730
</dl>
731731
</dd>
@@ -741,11 +741,11 @@ <h1>skbio.stats.distance.DistanceMatrix<a class="headerlink" href="#skbio-stats-
741741
<p>The distances are stored in redundant (square-form) format <a class="reference internal" href="#r8212bb0c75ea-1" id="id1">[1]</a>. To
742742
facilitate use with other scientific Python routines (e.g., scipy), the
743743
distances can be retrieved in condensed (vector-form) format using
744-
<cite>condensed_form</cite>.</p>
745-
<p><cite>DistanceMatrix</cite> only requires that the distances it stores are symmetric and
744+
<code class="docutils literal notranslate"><span class="pre">condensed_form</span></code>.</p>
745+
<p><code class="docutils literal notranslate"><span class="pre">DistanceMatrix</span></code> only requires that the distances it stores are symmetric and
746746
hollow. Checks are <em>not</em> performed to ensure the other three metric properties
747747
hold (non-negativity, identity of indiscernibles, and triangle inequality)
748-
<a class="reference internal" href="#r8212bb0c75ea-2" id="id2">[2]</a>. Thus, a <cite>DistanceMatrix</cite> instance can store distances that are not
748+
<a class="reference internal" href="#r8212bb0c75ea-2" id="id2">[2]</a>. Thus, a <code class="docutils literal notranslate"><span class="pre">DistanceMatrix</span></code> instance can store distances that are not
749749
metric.</p>
750750
<p class="rubric">References</p>
751751
<div role="list" class="citation-list">
@@ -795,7 +795,7 @@ <h1>skbio.stats.distance.DistanceMatrix<a class="headerlink" href="#skbio-stats-
795795
<td><p>Return an array of distances in condensed format.</p></td>
796796
</tr>
797797
<tr class="row-even"><td><p><a class="reference internal" href="skbio.stats.distance.DistanceMatrix.to_series.html#skbio.stats.distance.DistanceMatrix.to_series" title="skbio.stats.distance.DistanceMatrix.to_series"><code class="xref py py-obj docutils literal notranslate"><span class="pre">to_series</span></code></a>()</p></td>
798-
<td><p>Create a <code class="docutils literal notranslate"><span class="pre">pandas.Series</span></code> from this <code class="docutils literal notranslate"><span class="pre">DistanceMatrix</span></code>.</p></td>
798+
<td><p>Create a pandas Series from this <code class="docutils literal notranslate"><span class="pre">DistanceMatrix</span></code>.</p></td>
799799
</tr>
800800
</tbody>
801801
</table>
@@ -813,7 +813,7 @@ <h1>skbio.stats.distance.DistanceMatrix<a class="headerlink" href="#skbio-stats-
813813
<td><p>Filter the matrix by IDs.</p></td>
814814
</tr>
815815
<tr class="row-even"><td><p><a class="reference internal" href="skbio.stats.distance.SymmetricMatrix.from_iterable.html#skbio.stats.distance.SymmetricMatrix.from_iterable" title="skbio.stats.distance.SymmetricMatrix.from_iterable"><code class="xref py py-obj docutils literal notranslate"><span class="pre">from_iterable</span></code></a>(iterable, metric[, key, keys, ...])</p></td>
816-
<td><p>Create PairwiseMatrix from an iterable given a metric.</p></td>
816+
<td><p>Create a symmetric matrix from an iterable given a metric.</p></td>
817817
</tr>
818818
<tr class="row-odd"><td><p><a class="reference internal" href="skbio.stats.distance.PairwiseMatrix.index.html#skbio.stats.distance.PairwiseMatrix.index" title="skbio.stats.distance.PairwiseMatrix.index"><code class="xref py py-obj docutils literal notranslate"><span class="pre">index</span></code></a>(lookup_id)</p></td>
819819
<td><p>Return the index of the specified ID.</p></td>
@@ -834,7 +834,7 @@ <h1>skbio.stats.distance.DistanceMatrix<a class="headerlink" href="#skbio-stats-
834834
<td><p>Rename IDs in the matrix.</p></td>
835835
</tr>
836836
<tr class="row-odd"><td><p><a class="reference internal" href="skbio.stats.distance.PairwiseMatrix.to_data_frame.html#skbio.stats.distance.PairwiseMatrix.to_data_frame" title="skbio.stats.distance.PairwiseMatrix.to_data_frame"><code class="xref py py-obj docutils literal notranslate"><span class="pre">to_data_frame</span></code></a>()</p></td>
837-
<td><p>Create a <code class="docutils literal notranslate"><span class="pre">pandas.DataFrame</span></code> from this <code class="docutils literal notranslate"><span class="pre">PairwiseMatrix</span></code>.</p></td>
837+
<td><p>Create a pandas DataFrame from this matrix.</p></td>
838838
</tr>
839839
<tr class="row-even"><td><p><a class="reference internal" href="skbio.stats.distance.SymmetricMatrix.transpose.html#skbio.stats.distance.SymmetricMatrix.transpose" title="skbio.stats.distance.SymmetricMatrix.transpose"><code class="xref py py-obj docutils literal notranslate"><span class="pre">transpose</span></code></a>()</p></td>
840840
<td><p>Return the transpose of the matrix.</p></td>
@@ -861,7 +861,7 @@ <h1>skbio.stats.distance.DistanceMatrix<a class="headerlink" href="#skbio-stats-
861861
<td><p>Return self&gt;=value.</p></td>
862862
</tr>
863863
<tr class="row-even"><td><p><a class="reference internal" href="skbio.stats.distance.SymmetricMatrix.html#skbio.stats.distance.SymmetricMatrix.__getitem__" title="skbio.stats.distance.SymmetricMatrix.__getitem__"><code class="xref py py-obj docutils literal notranslate"><span class="pre">__getitem__</span></code></a>(index)</p></td>
864-
<td><p>Slice into data by object ID or numpy indexing.</p></td>
864+
<td><p>Slice into data by object ID or NumPy indexing.</p></td>
865865
</tr>
866866
<tr class="row-odd"><td><p><code class="xref py py-obj docutils literal notranslate"><span class="pre">__getstate__</span></code>(/)</p></td>
867867
<td><p>Helper for pickle.</p></td>

0 commit comments

Comments
 (0)