Skip to content

Commit 7a4ba21

Browse files
committed
Rebuild dev docs at master=d4532e2
1 parent f8d2e68 commit 7a4ba21

File tree

237 files changed

+1487
-1476
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+1487
-1476
lines changed

dev/_downloads/plot_compare_gpr_krr.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102
% (time.time() - stime))
103103

104104
# Plot results
105+
plt.figure(figsize = (10,5))
105106
plt.scatter(X, y, c='k', label='data')
106107
plt.plot(X_plot, np.sin(X_plot), c='k', label='True')
107108
plt.plot(X_plot, y_kr, c='g', label='KRR (%s)' % kr.best_params_)
@@ -111,6 +112,7 @@
111112
plt.xlabel('data')
112113
plt.ylabel('target')
113114
plt.xlim(0, 20)
115+
plt.ylim(-4, 4)
114116
plt.title('GPR versus Kernel Ridge')
115-
plt.legend(loc="best", prop={'size': 10})
117+
plt.legend(loc=9, prop={'size': 10})
116118
plt.show()

dev/_images/plot_compare_gpr_krr.png

-13.3 KB
Loading

dev/_images/plot_compare_gpr_krr1.png

-13.3 KB
Loading
15.5 KB
Loading
15.5 KB
Loading

dev/_sources/auto_examples/gaussian_process/plot_compare_gpr_krr.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ than just predicting the mean.
5656

5757
**Script output**::
5858

59-
Time for KRR fitting: 7.832
60-
Time for GPR fitting: 0.202
61-
Time for KRR prediction: 0.130
62-
Time for GPR prediction: 0.130
63-
Time for GPR prediction with standard-deviation: 0.747
59+
Time for KRR fitting: 7.571
60+
Time for GPR fitting: 0.194
61+
Time for KRR prediction: 0.138
62+
Time for GPR prediction: 0.150
63+
Time for GPR prediction with standard-deviation: 1.134
6464

6565

6666

@@ -69,6 +69,6 @@ than just predicting the mean.
6969
.. literalinclude:: plot_compare_gpr_krr.py
7070
:lines: 47-
7171

72-
**Total running time of the example:** 9.15 seconds
73-
( 0 minutes 9.15 seconds)
72+
**Total running time of the example:** 9.30 seconds
73+
( 0 minutes 9.30 seconds)
7474

dev/_sources/modules/pipeline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ and ``value`` is an estimator object::
156156
n_components=None, whiten=False)), ('kernel_pca', KernelPCA(alpha=1.0,
157157
coef0=1, degree=3, eigen_solver='auto', fit_inverse_transform=False,
158158
gamma=None, kernel='linear', kernel_params=None, max_iter=None,
159-
n_components=None, remove_zero_eig=False, tol=0))],
159+
n_components=None, random_state=None, remove_zero_eig=False, tol=0))],
160160
transformer_weights=None)
161161

162162
Like pipelines, feature unions have a shorthand constructor called

dev/_sources/whats_new.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ Bug fixes
4343
- Fixed bug in :func:`manifold.spectral_embedding` where diagonal of unnormalized
4444
Laplacian matrix was incorrectly set to 1. By `Peter Fischer`_.
4545

46+
- Fixed incorrect initialization of :func:`utils.arpack.eigsh` on all
47+
occurrences. Affects :class:`cluster.SpectralBiclustering`,
48+
:class:`decomposition.KernelPCA`, :class:`manifold.LocallyLinearEmbedding`,
49+
and :class:`manifold.SpectralEmbedding`. By `Peter Fischer`_.
4650

4751
API changes summary
4852
-------------------

dev/auto_examples/gaussian_process/plot_compare_gpr_krr.html

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,11 @@
206206
than just predicting the mean.</p>
207207
<img alt="../../_images/plot_compare_gpr_krr_001.png" class="align-center" src="../../_images/plot_compare_gpr_krr_001.png" />
208208
<p><strong>Script output</strong>:</p>
209-
<div class="highlight-python"><div class="highlight"><pre>Time for KRR fitting: 7.832
210-
Time for GPR fitting: 0.202
211-
Time for KRR prediction: 0.130
212-
Time for GPR prediction: 0.130
213-
Time for GPR prediction with standard-deviation: 0.747
209+
<div class="highlight-python"><div class="highlight"><pre>Time for KRR fitting: 7.571
210+
Time for GPR fitting: 0.194
211+
Time for KRR prediction: 0.138
212+
Time for GPR prediction: 0.150
213+
Time for GPR prediction with standard-deviation: 1.134
214214
</pre></div>
215215
</div>
216216
<p><strong>Python source code:</strong> <a class="reference download internal" href="../../_downloads/plot_compare_gpr_krr.py"><tt class="xref download docutils literal"><span class="pre">plot_compare_gpr_krr.py</span></tt></a></p>
@@ -272,6 +272,7 @@
272272
<span class="o">%</span> <span class="p">(</span><span class="n">time</span><span class="o">.</span><span class="n">time</span><span class="p">()</span> <span class="o">-</span> <span class="n">stime</span><span class="p">))</span>
273273

274274
<span class="c"># Plot results</span>
275+
<a href="http://matplotlib.org/api/figure_api.html#matplotlib.figure"><span class="n">plt</span><span class="o">.</span><span class="n">figure</span></a><span class="p">(</span><span class="n">figsize</span> <span class="o">=</span> <span class="p">(</span><span class="mi">10</span><span class="p">,</span><span class="mi">5</span><span class="p">))</span>
275276
<a href="http://matplotlib.org/api/pyplot_api.html#matplotlib.pyplot.scatter"><span class="n">plt</span><span class="o">.</span><span class="n">scatter</span></a><span class="p">(</span><span class="n">X</span><span class="p">,</span> <span class="n">y</span><span class="p">,</span> <span class="n">c</span><span class="o">=</span><span class="s">&#39;k&#39;</span><span class="p">,</span> <span class="n">label</span><span class="o">=</span><span class="s">&#39;data&#39;</span><span class="p">)</span>
276277
<a href="http://matplotlib.org/api/pyplot_api.html#matplotlib.pyplot.plot"><span class="n">plt</span><span class="o">.</span><span class="n">plot</span></a><span class="p">(</span><span class="n">X_plot</span><span class="p">,</span> <a href="http://docs.scipy.org/doc/numpy-1.6.0/reference/generated/numpy.sin.html#numpy.sin"><span class="n">np</span><span class="o">.</span><span class="n">sin</span></a><span class="p">(</span><span class="n">X_plot</span><span class="p">),</span> <span class="n">c</span><span class="o">=</span><span class="s">&#39;k&#39;</span><span class="p">,</span> <span class="n">label</span><span class="o">=</span><span class="s">&#39;True&#39;</span><span class="p">)</span>
277278
<a href="http://matplotlib.org/api/pyplot_api.html#matplotlib.pyplot.plot"><span class="n">plt</span><span class="o">.</span><span class="n">plot</span></a><span class="p">(</span><span class="n">X_plot</span><span class="p">,</span> <span class="n">y_kr</span><span class="p">,</span> <span class="n">c</span><span class="o">=</span><span class="s">&#39;g&#39;</span><span class="p">,</span> <span class="n">label</span><span class="o">=</span><span class="s">&#39;KRR (</span><span class="si">%s</span><span class="s">)&#39;</span> <span class="o">%</span> <span class="n">kr</span><span class="o">.</span><span class="n">best_params_</span><span class="p">)</span>
@@ -281,13 +282,14 @@
281282
<a href="http://matplotlib.org/api/pyplot_api.html#matplotlib.pyplot.xlabel"><span class="n">plt</span><span class="o">.</span><span class="n">xlabel</span></a><span class="p">(</span><span class="s">&#39;data&#39;</span><span class="p">)</span>
282283
<a href="http://matplotlib.org/api/pyplot_api.html#matplotlib.pyplot.ylabel"><span class="n">plt</span><span class="o">.</span><span class="n">ylabel</span></a><span class="p">(</span><span class="s">&#39;target&#39;</span><span class="p">)</span>
283284
<a href="http://matplotlib.org/api/pyplot_api.html#matplotlib.pyplot.xlim"><span class="n">plt</span><span class="o">.</span><span class="n">xlim</span></a><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="mi">20</span><span class="p">)</span>
285+
<a href="http://matplotlib.org/api/pyplot_api.html#matplotlib.pyplot.ylim"><span class="n">plt</span><span class="o">.</span><span class="n">ylim</span></a><span class="p">(</span><span class="o">-</span><span class="mi">4</span><span class="p">,</span> <span class="mi">4</span><span class="p">)</span>
284286
<a href="http://matplotlib.org/api/pyplot_api.html#matplotlib.pyplot.title"><span class="n">plt</span><span class="o">.</span><span class="n">title</span></a><span class="p">(</span><span class="s">&#39;GPR versus Kernel Ridge&#39;</span><span class="p">)</span>
285-
<a href="http://matplotlib.org/api/legend_api.html#matplotlib.legend"><span class="n">plt</span><span class="o">.</span><span class="n">legend</span></a><span class="p">(</span><span class="n">loc</span><span class="o">=</span><span class="s">&quot;best&quot;</span><span class="p">,</span> <span class="n">prop</span><span class="o">=</span><span class="p">{</span><span class="s">&#39;size&#39;</span><span class="p">:</span> <span class="mi">10</span><span class="p">})</span>
287+
<a href="http://matplotlib.org/api/legend_api.html#matplotlib.legend"><span class="n">plt</span><span class="o">.</span><span class="n">legend</span></a><span class="p">(</span><span class="n">loc</span><span class="o">=</span><span class="mi">9</span><span class="p">,</span> <span class="n">prop</span><span class="o">=</span><span class="p">{</span><span class="s">&#39;size&#39;</span><span class="p">:</span> <span class="mi">10</span><span class="p">})</span>
286288
<a href="http://matplotlib.org/api/pyplot_api.html#matplotlib.pyplot.show"><span class="n">plt</span><span class="o">.</span><span class="n">show</span></a><span class="p">()</span>
287289
</pre></div>
288290
</div>
289-
<p><strong>Total running time of the example:</strong> 9.15 seconds
290-
( 0 minutes 9.15 seconds)</p>
291+
<p><strong>Total running time of the example:</strong> 9.30 seconds
292+
( 0 minutes 9.30 seconds)</p>
291293
</div>
292294

293295

dev/modules/generated/sklearn.base.BaseEstimator.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
<h1><a class="reference internal" href="../classes.html#module-sklearn.base" title="sklearn.base"><tt class="xref py py-mod docutils literal"><span class="pre">sklearn.base</span></tt></a>.BaseEstimator<a class="headerlink" href="#sklearn-base-baseestimator" title="Permalink to this headline"></a></h1>
173173
<dl class="class">
174174
<dt id="sklearn.base.BaseEstimator">
175-
<em class="property">class </em><tt class="descclassname">sklearn.base.</tt><tt class="descname">BaseEstimator</tt><a class="reference external" href="https://github.com/scikit-learn/scikit-learn/blob/8b990c3/sklearn/base.py#L169"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#sklearn.base.BaseEstimator" title="Permalink to this definition"></a></dt>
175+
<em class="property">class </em><tt class="descclassname">sklearn.base.</tt><tt class="descname">BaseEstimator</tt><a class="reference external" href="https://github.com/scikit-learn/scikit-learn/blob/d4532e2/sklearn/base.py#L169"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#sklearn.base.BaseEstimator" title="Permalink to this definition"></a></dt>
176176
<dd><p>Base class for all estimators in scikit-learn</p>
177177
<p class="rubric">Notes</p>
178178
<p>All estimators should specify all the parameters that can be set
@@ -201,7 +201,7 @@ <h1><a class="reference internal" href="../classes.html#module-sklearn.base" tit
201201

202202
<dl class="method">
203203
<dt id="sklearn.base.BaseEstimator.get_params">
204-
<tt class="descname">get_params</tt><big>(</big><em>deep=True</em><big>)</big><a class="reference external" href="https://github.com/scikit-learn/scikit-learn/blob/8b990c3/sklearn/base.py#L206"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#sklearn.base.BaseEstimator.get_params" title="Permalink to this definition"></a></dt>
204+
<tt class="descname">get_params</tt><big>(</big><em>deep=True</em><big>)</big><a class="reference external" href="https://github.com/scikit-learn/scikit-learn/blob/d4532e2/sklearn/base.py#L206"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#sklearn.base.BaseEstimator.get_params" title="Permalink to this definition"></a></dt>
205205
<dd><p>Get parameters for this estimator.</p>
206206
<table class="docutils field-list" frame="void" rules="none">
207207
<col class="field-name" />
@@ -226,7 +226,7 @@ <h1><a class="reference internal" href="../classes.html#module-sklearn.base" tit
226226

227227
<dl class="method">
228228
<dt id="sklearn.base.BaseEstimator.set_params">
229-
<tt class="descname">set_params</tt><big>(</big><em>**params</em><big>)</big><a class="reference external" href="https://github.com/scikit-learn/scikit-learn/blob/8b990c3/sklearn/base.py#L243"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#sklearn.base.BaseEstimator.set_params" title="Permalink to this definition"></a></dt>
229+
<tt class="descname">set_params</tt><big>(</big><em>**params</em><big>)</big><a class="reference external" href="https://github.com/scikit-learn/scikit-learn/blob/d4532e2/sklearn/base.py#L243"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#sklearn.base.BaseEstimator.set_params" title="Permalink to this definition"></a></dt>
230230
<dd><p>Set the parameters of this estimator.</p>
231231
<p>The method works on simple estimators as well as on nested objects
232232
(such as pipelines). The former have parameters of the form

0 commit comments

Comments
 (0)