Skip to content

Commit 8a4096c

Browse files
committed
Pushing the docs to dev/ for branch: master, commit fa960581ef21be7ef53190ccd84cda342f154d29
1 parent a898751 commit 8a4096c

File tree

115 files changed

+340
-326
lines changed

Some content is hidden

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

115 files changed

+340
-326
lines changed
Binary file not shown.
Binary file not shown.
154 Bytes
Binary file not shown.

dev/_modules/skopt/searchcv.html

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,10 @@ <h1>Source code for skopt.searchcv</h1><div class="highlight"><pre>
369369
<span class="sd"> which gave highest score (or smallest loss if specified)</span>
370370
<span class="sd"> on the left out data. Not available if refit=False.</span>
371371

372+
<span class="sd"> optimizer_results_ : list of `OptimizeResult`</span>
373+
<span class="sd"> Contains a `OptimizeResult` for each search space. The search space</span>
374+
<span class="sd"> parameter are sorted by its name.</span>
375+
372376
<span class="sd"> best_score_ : float</span>
373377
<span class="sd"> Score of best_estimator on the left out data.</span>
374378

@@ -499,6 +503,11 @@ <h1>Source code for skopt.searchcv</h1><div class="highlight"><pre>
499503
<span class="n">check_is_fitted</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="s1">&#39;cv_results_&#39;</span><span class="p">)</span>
500504
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">cv_results_</span><span class="p">[</span><span class="s1">&#39;params&#39;</span><span class="p">][</span><span class="bp">self</span><span class="o">.</span><span class="n">best_index_</span><span class="p">]</span>
501505

506+
<span class="nd">@property</span>
507+
<span class="k">def</span> <span class="nf">optimizer_results_</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
508+
<span class="n">check_is_fitted</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="s1">&#39;_optim_results&#39;</span><span class="p">)</span>
509+
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_optim_results</span>
510+
502511
<span class="c1"># copied for compatibility with 0.19 sklearn from 0.18 BaseSearchCV</span>
503512
<span class="k">def</span> <span class="nf">_fit</span><span class="p">(</span><span class="bp">self</span><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">groups</span><span class="p">,</span> <span class="n">parameter_iterable</span><span class="p">):</span>
504513
<span class="sd">&quot;&quot;&quot;</span>
@@ -785,6 +794,7 @@ <h1>Source code for skopt.searchcv</h1><div class="highlight"><pre>
785794
<span class="bp">self</span><span class="o">.</span><span class="n">cv_results_</span> <span class="o">=</span> <span class="n">defaultdict</span><span class="p">(</span><span class="nb">list</span><span class="p">)</span>
786795
<span class="bp">self</span><span class="o">.</span><span class="n">best_index_</span> <span class="o">=</span> <span class="kc">None</span>
787796
<span class="bp">self</span><span class="o">.</span><span class="n">multimetric_</span> <span class="o">=</span> <span class="kc">False</span>
797+
<span class="bp">self</span><span class="o">.</span><span class="n">_optim_results</span> <span class="o">=</span> <span class="p">[]</span>
788798

789799
<span class="n">n_points</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">n_points</span>
790800

@@ -809,6 +819,7 @@ <h1>Source code for skopt.searchcv</h1><div class="highlight"><pre>
809819

810820
<span class="k">if</span> <span class="n">eval_callbacks</span><span class="p">(</span><span class="n">callbacks</span><span class="p">,</span> <span class="n">optim_result</span><span class="p">):</span>
811821
<span class="k">break</span>
822+
<span class="bp">self</span><span class="o">.</span><span class="n">_optim_results</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">optim_result</span><span class="p">)</span>
812823

813824
<span class="c1"># Refit the best model on the the whole dataset</span>
814825
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">refit</span><span class="p">:</span>

dev/_sources/auto_examples/ask-and-tell.rst.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ and report the value back to the optimizer:
177177
fun: 0.2071864923643295
178178
func_vals: array([0.20718649])
179179
models: []
180-
random_state: RandomState(MT19937) at 0x7FBF97D03D40
180+
random_state: RandomState(MT19937) at 0x7FDC52A2DD40
181181
space: Space([Real(low=-2.0, high=2.0, prior='uniform', transform='normalize')])
182182
specs: None
183183
x: [-0.7315058981975282]
@@ -315,7 +315,7 @@ meantime:
315315
316316
.. rst-class:: sphx-glr-timing
317317

318-
**Total running time of the script:** ( 0 minutes 2.686 seconds)
318+
**Total running time of the script:** ( 0 minutes 2.858 seconds)
319319

320320
**Estimated memory usage:** 8 MB
321321

dev/_sources/auto_examples/bayesian-optimization.rst.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -267,13 +267,13 @@ provide the following information:
267267
n_restarts_optimizer=2, noise=0.010000000000000002,
268268
normalize_y=True, optimizer='fmin_l_bfgs_b',
269269
random_state=822569775)]
270-
random_state: RandomState(MT19937) at 0x7FBF80324440
270+
random_state: RandomState(MT19937) at 0x7FDC3504C140
271271
space: Space([Real(low=-2.0, high=2.0, prior='uniform', transform='normalize')])
272-
specs: {'args': {'func': <function f at 0x7fbf7a008940>, 'dimensions': Space([Real(low=-2.0, high=2.0, prior='uniform', transform='normalize')]), 'base_estimator': GaussianProcessRegressor(alpha=1e-10, copy_X_train=True,
272+
specs: {'args': {'func': <function f at 0x7fdc2e466820>, 'dimensions': Space([Real(low=-2.0, high=2.0, prior='uniform', transform='normalize')]), 'base_estimator': GaussianProcessRegressor(alpha=1e-10, copy_X_train=True,
273273
kernel=1**2 * Matern(length_scale=1, nu=2.5),
274274
n_restarts_optimizer=2, noise=0.010000000000000002,
275275
normalize_y=True, optimizer='fmin_l_bfgs_b',
276-
random_state=822569775), 'n_calls': 15, 'n_random_starts': 5, 'n_initial_points': 10, 'initial_point_generator': 'random', 'acq_func': 'EI', 'acq_optimizer': 'auto', 'x0': None, 'y0': None, 'random_state': RandomState(MT19937) at 0x7FBF80324440, 'verbose': False, 'callback': None, 'n_points': 10000, 'n_restarts_optimizer': 5, 'xi': 0.01, 'kappa': 1.96, 'n_jobs': 1, 'model_queue_size': None}, 'function': 'base_minimize'}
276+
random_state=822569775), 'n_calls': 15, 'n_random_starts': 5, 'n_initial_points': 10, 'initial_point_generator': 'random', 'acq_func': 'EI', 'acq_optimizer': 'auto', 'x0': None, 'y0': None, 'random_state': RandomState(MT19937) at 0x7FDC3504C140, 'verbose': False, 'callback': None, 'n_points': 10000, 'n_restarts_optimizer': 5, 'xi': 0.01, 'kappa': 1.96, 'n_jobs': 1, 'model_queue_size': None}, 'function': 'base_minimize'}
277277
x: [-0.35076964188527904]
278278
x_iters: [[-0.009345334109402526], [1.2713537644662787], [0.4484475787090836], [1.0854396754496047], [1.4426790855107496], [0.9698921802985794], [-0.4464493263345517], [-0.6474638284799423], [-0.35076964188527904], [-0.28714767658880325], [-0.2968537755362253], [-2.0], [2.0], [-1.3149517825054502], [-0.32181607448732485]]
279279
@@ -305,7 +305,7 @@ the last iteration:
305305
.. code-block:: none
306306
307307
308-
<matplotlib.axes._subplots.AxesSubplot object at 0x7fbf7bcd7a30>
308+
<matplotlib.axes._subplots.AxesSubplot object at 0x7fdc2e4890a0>
309309
310310
311311
@@ -476,7 +476,7 @@ because the GP does not gain anything more by further exploration:
476476

477477
.. rst-class:: sphx-glr-timing
478478

479-
**Total running time of the script:** ( 0 minutes 3.381 seconds)
479+
**Total running time of the script:** ( 0 minutes 3.345 seconds)
480480

481481
**Estimated memory usage:** 8 MB
482482

dev/_sources/auto_examples/exploration-vs-exploitation.rst.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ recalculated.
562562

563563
.. rst-class:: sphx-glr-timing
564564

565-
**Total running time of the script:** ( 0 minutes 31.228 seconds)
565+
**Total running time of the script:** ( 0 minutes 32.216 seconds)
566566

567567
**Estimated memory usage:** 8 MB
568568

dev/_sources/auto_examples/hyperparameter-optimization.rst.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,16 +207,16 @@ Convergence plot
207207
.. code-block:: none
208208
209209
210-
<matplotlib.axes._subplots.AxesSubplot object at 0x7fbf7a3710a0>
210+
<matplotlib.axes._subplots.AxesSubplot object at 0x7fdc3505cfa0>
211211
212212
213213
214214
215215
.. rst-class:: sphx-glr-timing
216216

217-
**Total running time of the script:** ( 0 minutes 28.373 seconds)
217+
**Total running time of the script:** ( 0 minutes 29.300 seconds)
218218

219-
**Estimated memory usage:** 36 MB
219+
**Estimated memory usage:** 35 MB
220220

221221

222222
.. _sphx_glr_download_auto_examples_hyperparameter-optimization.py:

dev/_sources/auto_examples/interruptible-optimization.rst.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,13 @@ and pass it to the minimizer:
163163
n_restarts_optimizer=2, noise='gaussian',
164164
normalize_y=True, optimizer='fmin_l_bfgs_b',
165165
random_state=655685735)]
166-
random_state: RandomState(MT19937) at 0x7FBF802DCE40
166+
random_state: RandomState(MT19937) at 0x7FDC54FDFD40
167167
space: Space([Real(low=-20.0, high=20.0, prior='uniform', transform='normalize')])
168-
specs: {'args': {'func': <function obj_fun at 0x7fbf79ece700>, 'dimensions': Space([Real(low=-20.0, high=20.0, prior='uniform', transform='normalize')]), 'base_estimator': GaussianProcessRegressor(alpha=1e-10, copy_X_train=True,
168+
specs: {'args': {'func': <function obj_fun at 0x7fdc34d388b0>, 'dimensions': Space([Real(low=-20.0, high=20.0, prior='uniform', transform='normalize')]), 'base_estimator': GaussianProcessRegressor(alpha=1e-10, copy_X_train=True,
169169
kernel=1**2 * Matern(length_scale=1, nu=2.5),
170170
n_restarts_optimizer=2, noise='gaussian',
171171
normalize_y=True, optimizer='fmin_l_bfgs_b',
172-
random_state=655685735), 'n_calls': 10, 'n_random_starts': 0, 'n_initial_points': 10, 'initial_point_generator': 'random', 'acq_func': 'LCB', 'acq_optimizer': 'auto', 'x0': [-20.0], 'y0': None, 'random_state': RandomState(MT19937) at 0x7FBF802DCE40, 'verbose': False, 'callback': [<skopt.callbacks.CheckpointSaver object at 0x7fbf6f7c6c70>], 'n_points': 10000, 'n_restarts_optimizer': 5, 'xi': 0.01, 'kappa': 1.96, 'n_jobs': 1, 'model_queue_size': None}, 'function': 'base_minimize'}
172+
random_state=655685735), 'n_calls': 10, 'n_random_starts': 0, 'n_initial_points': 10, 'initial_point_generator': 'random', 'acq_func': 'LCB', 'acq_optimizer': 'auto', 'x0': [-20.0], 'y0': None, 'random_state': RandomState(MT19937) at 0x7FDC54FDFD40, 'verbose': False, 'callback': [<skopt.callbacks.CheckpointSaver object at 0x7fdc2e565fa0>], 'n_points': 10000, 'n_restarts_optimizer': 5, 'xi': 0.01, 'kappa': 1.96, 'n_jobs': 1, 'model_queue_size': None}, 'function': 'base_minimize'}
173173
x: [20.0]
174174
x_iters: [[-20.0], [20.0], [20.0], [-20.0], [-20.0], [20.0], [-20.0], [20.0], [20.0], [20.0]]
175175
@@ -321,14 +321,14 @@ The previous results can then be used to continue the optimization process:
321321
n_restarts_optimizer=2, noise='gaussian',
322322
normalize_y=True, optimizer='fmin_l_bfgs_b',
323323
random_state=655685735)]
324-
random_state: RandomState(MT19937) at 0x7FBF802DCE40
324+
random_state: RandomState(MT19937) at 0x7FDC54FDFD40
325325
space: Space([Real(low=-20.0, high=20.0, prior='uniform', transform='normalize')])
326-
specs: {'args': {'func': <function obj_fun at 0x7fbf79ece700>, 'dimensions': Space([Real(low=-20.0, high=20.0, prior='uniform', transform='normalize')]), 'base_estimator': GaussianProcessRegressor(alpha=1e-10, copy_X_train=True,
326+
specs: {'args': {'func': <function obj_fun at 0x7fdc34d388b0>, 'dimensions': Space([Real(low=-20.0, high=20.0, prior='uniform', transform='normalize')]), 'base_estimator': GaussianProcessRegressor(alpha=1e-10, copy_X_train=True,
327327
kernel=1**2 * Matern(length_scale=1, nu=2.5),
328328
n_restarts_optimizer=2, noise='gaussian',
329329
normalize_y=True, optimizer='fmin_l_bfgs_b',
330330
random_state=655685735), 'n_calls': 10, 'n_random_starts': 0, 'n_initial_points': 10, 'initial_point_generator': 'random', 'acq_func': 'LCB', 'acq_optimizer': 'auto', 'x0': [[-20.0], [20.0], [20.0], [-20.0], [-20.0], [20.0], [-20.0], [20.0], [20.0], [20.0]], 'y0': array([-0.04682088, -0.08228249, -0.00653801, -0.07133619, 0.09063509,
331-
0.07662367, 0.08260541, -0.13236828, -0.17524445, 0.10024491]), 'random_state': RandomState(MT19937) at 0x7FBF802DCE40, 'verbose': False, 'callback': [<skopt.callbacks.CheckpointSaver object at 0x7fbf6f7c6c70>], 'n_points': 10000, 'n_restarts_optimizer': 5, 'xi': 0.01, 'kappa': 1.96, 'n_jobs': 1, 'model_queue_size': None}, 'function': 'base_minimize'}
331+
0.07662367, 0.08260541, -0.13236828, -0.17524445, 0.10024491]), 'random_state': RandomState(MT19937) at 0x7FDC54FDFD40, 'verbose': False, 'callback': [<skopt.callbacks.CheckpointSaver object at 0x7fdc2e565fa0>], 'n_points': 10000, 'n_restarts_optimizer': 5, 'xi': 0.01, 'kappa': 1.96, 'n_jobs': 1, 'model_queue_size': None}, 'function': 'base_minimize'}
332332
x: [20.0]
333333
x_iters: [[-20.0], [20.0], [20.0], [-20.0], [-20.0], [20.0], [-20.0], [20.0], [20.0], [20.0], [20.0], [20.0], [-20.0], [-20.0], [-20.0], [-20.0], [-20.0], [-20.0], [-20.0], [-20.0]]
334334
@@ -350,7 +350,7 @@ for more information on how the results get saved and possible caveats
350350

351351
.. rst-class:: sphx-glr-timing
352352

353-
**Total running time of the script:** ( 0 minutes 3.009 seconds)
353+
**Total running time of the script:** ( 0 minutes 2.953 seconds)
354354

355355
**Estimated memory usage:** 8 MB
356356

dev/_sources/auto_examples/optimizer-with-different-base-estimator.rst.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ Test different kernels
292292

293293
.. rst-class:: sphx-glr-timing
294294

295-
**Total running time of the script:** ( 0 minutes 8.462 seconds)
295+
**Total running time of the script:** ( 0 minutes 8.742 seconds)
296296

297297
**Estimated memory usage:** 13 MB
298298

dev/_sources/auto_examples/parallel-optimization.rst.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ scikit-optimize.
119119
120120
.. rst-class:: sphx-glr-timing
121121

122-
**Total running time of the script:** ( 0 minutes 27.832 seconds)
122+
**Total running time of the script:** ( 0 minutes 30.722 seconds)
123123

124-
**Estimated memory usage:** 30 MB
124+
**Estimated memory usage:** 31 MB
125125

126126

127127
.. _sphx_glr_download_auto_examples_parallel-optimization.py:

dev/_sources/auto_examples/plots/partial-dependence-plot-with-categorical.rst.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ parsing a list as the pars argument:
190190

191191
.. rst-class:: sphx-glr-timing
192192

193-
**Total running time of the script:** ( 0 minutes 24.435 seconds)
193+
**Total running time of the script:** ( 0 minutes 33.463 seconds)
194194

195195
**Estimated memory usage:** 34 MB
196196

dev/_sources/auto_examples/plots/partial-dependence-plot.rst.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,9 @@ as the minimum argument:
259259

260260
.. rst-class:: sphx-glr-timing
261261

262-
**Total running time of the script:** ( 3 minutes 48.490 seconds)
262+
**Total running time of the script:** ( 4 minutes 25.515 seconds)
263263

264-
**Estimated memory usage:** 9 MB
264+
**Estimated memory usage:** 8 MB
265265

266266

267267
.. _sphx_glr_download_auto_examples_plots_partial-dependence-plot.py:

dev/_sources/auto_examples/plots/sg_execution_times.rst.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
Computation times
77
=================
8-
**11:25.371** total execution time for **auto_examples_plots** files:
8+
**13:15.287** total execution time for **auto_examples_plots** files:
99

1010
+-----------------------------------------------------------------------------------------------------------------------------------+-----------+---------+
11-
| :ref:`sphx_glr_auto_examples_plots_visualizing-results.py` (``visualizing-results.py``) | 07:12.447 | 88.2 MB |
11+
| :ref:`sphx_glr_auto_examples_plots_visualizing-results.py` (``visualizing-results.py``) | 08:16.308 | 87.8 MB |
1212
+-----------------------------------------------------------------------------------------------------------------------------------+-----------+---------+
13-
| :ref:`sphx_glr_auto_examples_plots_partial-dependence-plot.py` (``partial-dependence-plot.py``) | 03:48.490 | 8.8 MB |
13+
| :ref:`sphx_glr_auto_examples_plots_partial-dependence-plot.py` (``partial-dependence-plot.py``) | 04:25.515 | 8.3 MB |
1414
+-----------------------------------------------------------------------------------------------------------------------------------+-----------+---------+
15-
| :ref:`sphx_glr_auto_examples_plots_partial-dependence-plot-with-categorical.py` (``partial-dependence-plot-with-categorical.py``) | 00:24.435 | 34.1 MB |
15+
| :ref:`sphx_glr_auto_examples_plots_partial-dependence-plot-with-categorical.py` (``partial-dependence-plot-with-categorical.py``) | 00:33.463 | 34.2 MB |
1616
+-----------------------------------------------------------------------------------------------------------------------------------+-----------+---------+

dev/_sources/auto_examples/plots/visualizing-results.rst.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ in both the placement of samples and the partial dependence plots.
360360

361361
.. rst-class:: sphx-glr-timing
362362

363-
**Total running time of the script:** ( 7 minutes 12.447 seconds)
363+
**Total running time of the script:** ( 8 minutes 16.308 seconds)
364364

365365
**Estimated memory usage:** 88 MB
366366

dev/_sources/auto_examples/sampler/initial-sampling-method-integer.rst.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ It can be seen that random has the worst performance
429429

430430
.. rst-class:: sphx-glr-timing
431431

432-
**Total running time of the script:** ( 0 minutes 7.600 seconds)
432+
**Total running time of the script:** ( 0 minutes 7.906 seconds)
433433

434434
**Estimated memory usage:** 8 MB
435435

dev/_sources/auto_examples/sampler/initial-sampling-method.rst.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ It can be seen that random has the worst performance
340340

341341
.. rst-class:: sphx-glr-timing
342342

343-
**Total running time of the script:** ( 0 minutes 7.586 seconds)
343+
**Total running time of the script:** ( 0 minutes 7.751 seconds)
344344

345345
**Estimated memory usage:** 8 MB
346346

dev/_sources/auto_examples/sampler/sampling_comparison.rst.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ n_random_starts = 10 produces the best results
283283

284284
.. rst-class:: sphx-glr-timing
285285

286-
**Total running time of the script:** ( 2 minutes 49.252 seconds)
286+
**Total running time of the script:** ( 3 minutes 12.338 seconds)
287287

288288
**Estimated memory usage:** 8 MB
289289

dev/_sources/auto_examples/sampler/sg_execution_times.rst.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
Computation times
77
=================
8-
**03:04.438** total execution time for **auto_examples_sampler** files:
8+
**03:27.994** total execution time for **auto_examples_sampler** files:
99

1010
+-------------------------------------------------------------------------------------------------------------------+-----------+--------+
11-
| :ref:`sphx_glr_auto_examples_sampler_sampling_comparison.py` (``sampling_comparison.py``) | 02:49.252 | 8.2 MB |
11+
| :ref:`sphx_glr_auto_examples_sampler_sampling_comparison.py` (``sampling_comparison.py``) | 03:12.338 | 8.0 MB |
1212
+-------------------------------------------------------------------------------------------------------------------+-----------+--------+
13-
| :ref:`sphx_glr_auto_examples_sampler_initial-sampling-method-integer.py` (``initial-sampling-method-integer.py``) | 00:07.600 | 8.2 MB |
13+
| :ref:`sphx_glr_auto_examples_sampler_initial-sampling-method-integer.py` (``initial-sampling-method-integer.py``) | 00:07.906 | 8.0 MB |
1414
+-------------------------------------------------------------------------------------------------------------------+-----------+--------+
15-
| :ref:`sphx_glr_auto_examples_sampler_initial-sampling-method.py` (``initial-sampling-method.py``) | 00:07.586 | 8.3 MB |
15+
| :ref:`sphx_glr_auto_examples_sampler_initial-sampling-method.py` (``initial-sampling-method.py``) | 00:07.751 | 8.1 MB |
1616
+-------------------------------------------------------------------------------------------------------------------+-----------+--------+

0 commit comments

Comments
 (0)