Skip to content

Commit 6214563

Browse files
committed
Pushing the docs for revision for branch: master, commit 2df7746ba91f31e874e78643c8b4ef98d4b54c57
1 parent a674a99 commit 6214563

File tree

99 files changed

+310
-272
lines changed

Some content is hidden

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

99 files changed

+310
-272
lines changed
Binary file not shown.
Binary file not shown.

_modules/skopt/utils.html

Lines changed: 55 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,59 @@ <h1>Source code for skopt.utils</h1><div class="highlight"><pre>
698698
<span class="k">return</span> <span class="n">Space</span><span class="p">(</span><span class="n">transformed_dimensions</span><span class="p">)</span>
699699

700700

701+
<span class="k">def</span> <span class="nf">check_list_types</span><span class="p">(</span><span class="n">x</span><span class="p">,</span> <span class="n">types</span><span class="p">):</span>
702+
<span class="sd">&quot;&quot;&quot;</span>
703+
<span class="sd"> Check whether all elements of a list `x` are of the correct type(s)</span>
704+
<span class="sd"> and raise a ValueError if they are not.</span>
705+
706+
<span class="sd"> Note that `types` can be either a single object-type or a tuple</span>
707+
<span class="sd"> of object-types.</span>
708+
709+
<span class="sd"> Raises `ValueError`, If one or more element in the list `x` is</span>
710+
<span class="sd"> not of the correct type(s).</span>
711+
712+
<span class="sd"> Parameters</span>
713+
<span class="sd"> ----------</span>
714+
<span class="sd"> x : list</span>
715+
<span class="sd"> List of objects.</span>
716+
717+
<span class="sd"> types : object or list(object)</span>
718+
<span class="sd"> Either a single object-type or a tuple of object-types.</span>
719+
720+
<span class="sd"> &quot;&quot;&quot;</span>
721+
722+
<span class="c1"># List of the elements in the list that are incorrectly typed.</span>
723+
<span class="n">err</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="nb">filter</span><span class="p">(</span><span class="k">lambda</span> <span class="n">a</span><span class="p">:</span> <span class="ow">not</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">a</span><span class="p">,</span> <span class="n">types</span><span class="p">),</span> <span class="n">x</span><span class="p">))</span>
724+
725+
<span class="c1"># If the list is non-empty then raise an exception.</span>
726+
<span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">err</span><span class="p">)</span> <span class="o">&gt;</span> <span class="mi">0</span><span class="p">:</span>
727+
<span class="n">msg</span> <span class="o">=</span> <span class="s2">&quot;All elements in list must be instances of </span><span class="si">{}</span><span class="s2">, but found: </span><span class="si">{}</span><span class="s2">&quot;</span>
728+
<span class="n">msg</span> <span class="o">=</span> <span class="n">msg</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">types</span><span class="p">,</span> <span class="n">err</span><span class="p">)</span>
729+
<span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="n">msg</span><span class="p">)</span>
730+
731+
732+
<span class="k">def</span> <span class="nf">check_dimension_names</span><span class="p">(</span><span class="n">dimensions</span><span class="p">):</span>
733+
<span class="sd">&quot;&quot;&quot;</span>
734+
<span class="sd"> Check whether all dimensions have names. Raises `ValueError`,</span>
735+
<span class="sd"> if one or more dimensions are unnamed.</span>
736+
737+
<span class="sd"> Parameters</span>
738+
<span class="sd"> ----------</span>
739+
<span class="sd"> dimensions : list(Dimension)</span>
740+
<span class="sd"> List of Dimension-objects.</span>
741+
742+
<span class="sd"> &quot;&quot;&quot;</span>
743+
744+
<span class="c1"># List of the dimensions that have no names.</span>
745+
<span class="n">err_dims</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="nb">filter</span><span class="p">(</span><span class="k">lambda</span> <span class="n">dim</span><span class="p">:</span> <span class="n">dim</span><span class="o">.</span><span class="n">name</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">,</span> <span class="n">dimensions</span><span class="p">))</span>
746+
747+
<span class="c1"># If the list is non-empty then raise an exception.</span>
748+
<span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">err_dims</span><span class="p">)</span> <span class="o">&gt;</span> <span class="mi">0</span><span class="p">:</span>
749+
<span class="n">msg</span> <span class="o">=</span> <span class="s2">&quot;All dimensions must have names, but found: </span><span class="si">{}</span><span class="s2">&quot;</span>
750+
<span class="n">msg</span> <span class="o">=</span> <span class="n">msg</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">err_dims</span><span class="p">)</span>
751+
<span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="n">msg</span><span class="p">)</span>
752+
753+
701754
<div class="viewcode-block" id="use_named_args"><a class="viewcode-back" href="../../modules/generated/skopt.utils.use_named_args.html#skopt.use_named_args">[docs]</a><span class="k">def</span> <span class="nf">use_named_args</span><span class="p">(</span><span class="n">dimensions</span><span class="p">):</span>
702755
<span class="sd">&quot;&quot;&quot;</span>
703756
<span class="sd"> Wrapper / decorator for an objective function that uses named arguments</span>
@@ -783,25 +836,10 @@ <h1>Source code for skopt.utils</h1><div class="highlight"><pre>
783836
<span class="sd"> &quot;&quot;&quot;</span>
784837

785838
<span class="c1"># Ensure all dimensions are correctly typed.</span>
786-
<span class="k">if</span> <span class="ow">not</span> <span class="nb">all</span><span class="p">(</span><span class="nb">isinstance</span><span class="p">(</span><span class="n">dim</span><span class="p">,</span> <span class="n">Dimension</span><span class="p">)</span> <span class="k">for</span> <span class="n">dim</span> <span class="ow">in</span> <span class="n">dimensions</span><span class="p">):</span>
787-
<span class="c1"># List of the dimensions that are incorrectly typed.</span>
788-
<span class="n">err_dims</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="nb">filter</span><span class="p">(</span><span class="k">lambda</span> <span class="n">dim</span><span class="p">:</span> <span class="ow">not</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">dim</span><span class="p">,</span> <span class="n">Dimension</span><span class="p">),</span>
789-
<span class="n">dimensions</span><span class="p">))</span>
790-
791-
<span class="c1"># Error message.</span>
792-
<span class="n">msg</span> <span class="o">=</span> <span class="s2">&quot;All dimensions must be instances of the Dimension-class, but found: </span><span class="si">{}</span><span class="s2">&quot;</span>
793-
<span class="n">msg</span> <span class="o">=</span> <span class="n">msg</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">err_dims</span><span class="p">)</span>
794-
<span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="n">msg</span><span class="p">)</span>
839+
<span class="n">check_list_types</span><span class="p">(</span><span class="n">dimensions</span><span class="p">,</span> <span class="n">Dimension</span><span class="p">)</span>
795840

796841
<span class="c1"># Ensure all dimensions have names.</span>
797-
<span class="k">if</span> <span class="nb">any</span><span class="p">(</span><span class="n">dim</span><span class="o">.</span><span class="n">name</span> <span class="ow">is</span> <span class="kc">None</span> <span class="k">for</span> <span class="n">dim</span> <span class="ow">in</span> <span class="n">dimensions</span><span class="p">):</span>
798-
<span class="c1"># List of the dimensions that have no names.</span>
799-
<span class="n">err_dims</span> <span class="o">=</span> <span class="nb">list</span><span class="p">(</span><span class="nb">filter</span><span class="p">(</span><span class="k">lambda</span> <span class="n">dim</span><span class="p">:</span> <span class="n">dim</span><span class="o">.</span><span class="n">name</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">,</span> <span class="n">dimensions</span><span class="p">))</span>
800-
801-
<span class="c1"># Error message.</span>
802-
<span class="n">msg</span> <span class="o">=</span> <span class="s2">&quot;All dimensions must have names, but found: </span><span class="si">{}</span><span class="s2">&quot;</span>
803-
<span class="n">msg</span> <span class="o">=</span> <span class="n">msg</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">err_dims</span><span class="p">)</span>
804-
<span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="n">msg</span><span class="p">)</span>
842+
<span class="n">check_dimension_names</span><span class="p">(</span><span class="n">dimensions</span><span class="p">)</span>
805843

806844
<span class="nd">@wraps</span><span class="p">(</span><span class="n">func</span><span class="p">)</span>
807845
<span class="k">def</span> <span class="nf">wrapper</span><span class="p">(</span><span class="n">x</span><span class="p">):</span>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ and report the value back to the optimizer:
175175
fun: -0.032758350111535384
176176
func_vals: array([-0.03275835])
177177
models: []
178-
random_state: RandomState(MT19937) at 0x7FE82C8B5A40
178+
random_state: RandomState(MT19937) at 0x7FF586BE2A40
179179
space: Space([Real(low=-2.0, high=2.0, prior='uniform', transform='identity')])
180180
specs: None
181181
x: [-1.7121321838148869]
@@ -312,7 +312,7 @@ meantime:
312312
313313
.. rst-class:: sphx-glr-timing
314314

315-
**Total running time of the script:** ( 0 minutes 2.964 seconds)
315+
**Total running time of the script:** ( 0 minutes 2.872 seconds)
316316

317317

318318
.. _sphx_glr_download_auto_examples_ask-and-tell.py:

_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 0x7FE8779C3A40
270+
random_state: RandomState(MT19937) at 0x7FF5D4326A40
271271
space: Space([Real(low=-2.0, high=2.0, prior='uniform', transform='normalize')])
272-
specs: {'args': {'func': <function f at 0x7fe877a6cc10>, '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 0x7ff5d6b458b0>, '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, 'acq_func': 'EI', 'acq_optimizer': 'auto', 'x0': None, 'y0': None, 'random_state': RandomState(MT19937) at 0x7FE8779C3A40, '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, 'acq_func': 'EI', 'acq_optimizer': 'auto', 'x0': None, 'y0': None, 'random_state': RandomState(MT19937) at 0x7FF5D4326A40, '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.35076964213550554]
278278
x_iters: [[-0.009345334109402526], [1.2713537644662787], [0.4484475787090836], [1.0854396754496047], [1.4426790855107496], [0.9698921802985794], [-0.4464493263345515], [-0.6474638307563569], [-0.35076964213550554], [-0.28714768066245777], [-0.2968537677230516], [-2.0], [2.0], [-1.3149517821938494], [-0.3218160845454081]]
279279
@@ -305,7 +305,7 @@ the last iteration:
305305
.. code-block:: none
306306
307307
308-
<matplotlib.axes._subplots.AxesSubplot object at 0x7fe87cadea60>
308+
<matplotlib.axes._subplots.AxesSubplot object at 0x7ff5521050a0>
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.256 seconds)
479+
**Total running time of the script:** ( 0 minutes 3.089 seconds)
480480

481481

482482
.. _sphx_glr_download_auto_examples_bayesian-optimization.py:

_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:** ( 1 minutes 10.731 seconds)
565+
**Total running time of the script:** ( 1 minutes 4.196 seconds)
566566

567567

568568
.. _sphx_glr_download_auto_examples_exploration-vs-exploitation.py:

_sources/auto_examples/hyperparameter-optimization.rst.txt

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

217-
**Total running time of the script:** ( 1 minutes 13.616 seconds)
217+
**Total running time of the script:** ( 1 minutes 47.417 seconds)
218218

219219

220220
.. _sphx_glr_download_auto_examples_hyperparameter-optimization.py:

_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 0x7FE8779C3A40
166+
random_state: RandomState(MT19937) at 0x7FF5D4326A40
167167
space: Space([Real(low=-20.0, high=20.0, prior='uniform', transform='normalize')])
168-
specs: {'args': {'func': <function obj_fun at 0x7fe87c8a20d0>, '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 0x7ff5d6cf1ca0>, '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, 'acq_func': 'LCB', 'acq_optimizer': 'auto', 'x0': [-20.0], 'y0': None, 'random_state': RandomState(MT19937) at 0x7FE8779C3A40, 'verbose': False, 'callback': [<skopt.callbacks.CheckpointSaver object at 0x7fe7f8011e20>], '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, 'acq_func': 'LCB', 'acq_optimizer': 'auto', 'x0': [-20.0], 'y0': None, 'random_state': RandomState(MT19937) at 0x7FF5D4326A40, 'verbose': False, 'callback': [<skopt.callbacks.CheckpointSaver object at 0x7ff551ff8100>], '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 0x7FE8779C3A40
324+
random_state: RandomState(MT19937) at 0x7FF5D4326A40
325325
space: Space([Real(low=-20.0, high=20.0, prior='uniform', transform='normalize')])
326-
specs: {'args': {'func': <function obj_fun at 0x7fe87c8a20d0>, '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 0x7ff5d6cf1ca0>, '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, '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 0x7FE8779C3A40, 'verbose': False, 'callback': [<skopt.callbacks.CheckpointSaver object at 0x7fe7f8011e20>], '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 0x7FF5D4326A40, 'verbose': False, 'callback': [<skopt.callbacks.CheckpointSaver object at 0x7ff551ff8100>], '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 4.516 seconds)
353+
**Total running time of the script:** ( 0 minutes 4.054 seconds)
354354

355355

356356
.. _sphx_glr_download_auto_examples_interruptible-optimization.py:

_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 14.248 seconds)
295+
**Total running time of the script:** ( 0 minutes 12.924 seconds)
296296

297297

298298
.. _sphx_glr_download_auto_examples_optimizer-with-different-base-estimator.py:

_sources/auto_examples/parallel-optimization.rst.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ scikit-optimize.
119119
120120
.. rst-class:: sphx-glr-timing
121121

122-
**Total running time of the script:** ( 1 minutes 13.460 seconds)
122+
**Total running time of the script:** ( 1 minutes 37.025 seconds)
123123

124124

125125
.. _sphx_glr_download_auto_examples_parallel-optimization.py:

_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 26.600 seconds)
193+
**Total running time of the script:** ( 0 minutes 26.428 seconds)
194194

195195

196196
.. _sphx_glr_download_auto_examples_plots_partial-dependence-plot-with-categorical.py:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ as the minimum argument:
259259

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

262-
**Total running time of the script:** ( 4 minutes 14.242 seconds)
262+
**Total running time of the script:** ( 4 minutes 1.322 seconds)
263263

264264

265265
.. _sphx_glr_download_auto_examples_plots_partial-dependence-plot.py:

0 commit comments

Comments
 (0)