Pushing the docs to dev/ for branch: master, commit 9bcdac66057c1c37f3d6dedec2ae0ac82f384281

Author: skoptci

dev/_downloads/3409d9766d352cc9f9b169d4a799a87a/auto_examples_python.zip

@@ -127,7 +127,8 @@
       <div class="sk-page-content container-fluid body px-md-3" role="main">
 
   <h1>Source code for skopt.plots</h1><div class="highlight"><pre>
-<span></span><span class="sd">&quot;&quot;&quot;Plotting functions.&quot;&quot;&quot;</span>
+<span></span><span class="c1"># -*- encoding: UTF-8 -*-</span>
+<span class="sd">&quot;&quot;&quot;Plotting functions.&quot;&quot;&quot;</span>
 <span class="kn">import</span> <span class="nn">sys</span>
 <span class="kn">import</span> <span class="nn">numpy</span> <span class="k">as</span> <span class="nn">np</span>
 <span class="kn">from</span> <span class="nn">itertools</span> <span class="kn">import</span> <span class="n">count</span>

dev/_downloads/d34667f097c619f8afda4bc936e7af21/auto_examples_jupyter.zip

@@ -182,8 +182,7 @@ <h1>Source code for skopt.searchcv</h1><div class="highlight"><pre>
 <span class="sd">        Either estimator needs to provide a ``score`` function,</span>
 <span class="sd">        or ``scoring`` must be passed.</span>
 
-<span class="sd">    search_spaces : dict, list of dict or list of tuple containing</span>
-<span class="sd">        (dict, int).</span>
+<span class="sd">    search_spaces : dict, list of dict or list of tuple containing (dict, int).</span>
 <span class="sd">        One of these cases:</span>
 <span class="sd">        1. dictionary, where keys are parameter names (strings)</span>
 <span class="sd">        and values are skopt.space.Dimension instances (Real, Integer</span>

dev/_downloads/scikit-optimize-docs.pdf

@@ -407,7 +407,7 @@ <h1>Source code for skopt.space.space</h1><div class="highlight"><pre>
             <span class="n">transform</span> <span class="o">=</span> <span class="s2">&quot;identity&quot;</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">set_transformer</span><span class="p">(</span><span class="n">transform</span><span class="p">)</span></div>
 
-<div class="viewcode-block" id="Real.set_transformer"><a class="viewcode-back" href="../../../modules/generated/skopt.space.space.Real.html#skopt.Real.set_transformer">[docs]</a>    <span class="k">def</span> <span class="nf">set_transformer</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">transform</span><span class="o">=</span><span class="s2">&quot;identitiy&quot;</span><span class="p">):</span>
+<div class="viewcode-block" id="Real.set_transformer"><a class="viewcode-back" href="../../../modules/generated/skopt.space.space.Real.html#skopt.Real.set_transformer">[docs]</a>    <span class="k">def</span> <span class="nf">set_transformer</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">transform</span><span class="o">=</span><span class="s2">&quot;identity&quot;</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot;Define rvs and transformer spaces.</span>
 
 <span class="sd">        Parameters</span>
@@ -595,7 +595,7 @@ <h1>Source code for skopt.space.space</h1><div class="highlight"><pre>
             <span class="n">transform</span> <span class="o">=</span> <span class="s2">&quot;identity&quot;</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">set_transformer</span><span class="p">(</span><span class="n">transform</span><span class="p">)</span></div>
 
-<div class="viewcode-block" id="Integer.set_transformer"><a class="viewcode-back" href="../../../modules/generated/skopt.space.space.Integer.html#skopt.Integer.set_transformer">[docs]</a>    <span class="k">def</span> <span class="nf">set_transformer</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">transform</span><span class="o">=</span><span class="s2">&quot;identitiy&quot;</span><span class="p">):</span>
+<div class="viewcode-block" id="Integer.set_transformer"><a class="viewcode-back" href="../../../modules/generated/skopt.space.space.Integer.html#skopt.Integer.set_transformer">[docs]</a>    <span class="k">def</span> <span class="nf">set_transformer</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">transform</span><span class="o">=</span><span class="s2">&quot;identity&quot;</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot;Define _rvs and transformer spaces.</span>
 
 <span class="sd">        Parameters</span>

dev/_images/binder_badge_logo.png

@@ -149,7 +149,6 @@ <h1>Source code for skopt.utils</h1><div class="highlight"><pre>
 <span class="kn">from</span> <span class="nn">.sampler</span> <span class="kn">import</span> <span class="n">InitialPointGenerator</span>
 <span class="kn">from</span> <span class="nn">.space</span> <span class="kn">import</span> <span class="n">Space</span><span class="p">,</span> <span class="n">Categorical</span><span class="p">,</span> <span class="n">Integer</span><span class="p">,</span> <span class="n">Real</span><span class="p">,</span> <span class="n">Dimension</span>
 
-
 <span class="n">__all__</span> <span class="o">=</span> <span class="p">(</span>
     <span class="s2">&quot;load&quot;</span><span class="p">,</span>
     <span class="s2">&quot;dump&quot;</span><span class="p">,</span>
@@ -499,7 +498,6 @@ <h1>Source code for skopt.utils</h1><div class="highlight"><pre>
             <span class="n">space</span> <span class="o">=</span> <span class="n">Space</span><span class="p">(</span><span class="n">normalize_dimensions</span><span class="p">(</span><span class="n">space</span><span class="o">.</span><span class="n">dimensions</span><span class="p">))</span>
             <span class="n">n_dims</span> <span class="o">=</span> <span class="n">space</span><span class="o">.</span><span class="n">transformed_n_dims</span>
             <span class="n">is_cat</span> <span class="o">=</span> <span class="n">space</span><span class="o">.</span><span class="n">is_categorical</span>
-
         <span class="k">else</span><span class="p">:</span>
             <span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="s2">&quot;Expected a Space instance, not None.&quot;</span><span class="p">)</span>
 
@@ -723,26 +721,14 @@ <h1>Source code for skopt.utils</h1><div class="highlight"><pre>
     <span class="n">space</span> <span class="o">=</span> <span class="n">Space</span><span class="p">(</span><span class="n">dimensions</span><span class="p">)</span>
     <span class="n">transformed_dimensions</span> <span class="o">=</span> <span class="p">[]</span>
     <span class="k">for</span> <span class="n">dimension</span> <span class="ow">in</span> <span class="n">space</span><span class="o">.</span><span class="n">dimensions</span><span class="p">:</span>
-        <span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">dimension</span><span class="p">,</span> <span class="n">Categorical</span><span class="p">):</span>
-            <span class="n">transformed_dimensions</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">Categorical</span><span class="p">(</span><span class="n">dimension</span><span class="o">.</span><span class="n">categories</span><span class="p">,</span>
-                                                      <span class="n">dimension</span><span class="o">.</span><span class="n">prior</span><span class="p">,</span>
-                                                      <span class="n">name</span><span class="o">=</span><span class="n">dimension</span><span class="o">.</span><span class="n">name</span><span class="p">,</span>
-                                                      <span class="n">transform</span><span class="o">=</span><span class="s2">&quot;normalize&quot;</span><span class="p">))</span>
-        <span class="c1"># To make sure that GP operates in the [0, 1] space</span>
-        <span class="k">elif</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">dimension</span><span class="p">,</span> <span class="n">Real</span><span class="p">):</span>
-            <span class="n">transformed_dimensions</span><span class="o">.</span><span class="n">append</span><span class="p">(</span>
-                <span class="n">Real</span><span class="p">(</span><span class="n">dimension</span><span class="o">.</span><span class="n">low</span><span class="p">,</span> <span class="n">dimension</span><span class="o">.</span><span class="n">high</span><span class="p">,</span> <span class="n">dimension</span><span class="o">.</span><span class="n">prior</span><span class="p">,</span>
-                     <span class="n">name</span><span class="o">=</span><span class="n">dimension</span><span class="o">.</span><span class="n">name</span><span class="p">,</span>
-                     <span class="n">transform</span><span class="o">=</span><span class="s2">&quot;normalize&quot;</span><span class="p">,</span>
-                     <span class="n">dtype</span><span class="o">=</span><span class="n">dimension</span><span class="o">.</span><span class="n">dtype</span><span class="p">)</span>
-                <span class="p">)</span>
-        <span class="k">elif</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">dimension</span><span class="p">,</span> <span class="n">Integer</span><span class="p">):</span>
+        <span class="c1"># check if dimension is of a Dimension instance</span>
+        <span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">dimension</span><span class="p">,</span> <span class="n">Dimension</span><span class="p">):</span>
+            <span class="c1"># Change the transformer to normalize</span>
+            <span class="c1"># and add it to the new transformed dimensions</span>
+            <span class="n">dimension</span><span class="o">.</span><span class="n">set_transformer</span><span class="p">(</span><span class="s2">&quot;normalize&quot;</span><span class="p">)</span>
             <span class="n">transformed_dimensions</span><span class="o">.</span><span class="n">append</span><span class="p">(</span>
-                <span class="n">Integer</span><span class="p">(</span><span class="n">dimension</span><span class="o">.</span><span class="n">low</span><span class="p">,</span> <span class="n">dimension</span><span class="o">.</span><span class="n">high</span><span class="p">,</span>
-                        <span class="n">name</span><span class="o">=</span><span class="n">dimension</span><span class="o">.</span><span class="n">name</span><span class="p">,</span>
-                        <span class="n">transform</span><span class="o">=</span><span class="s2">&quot;normalize&quot;</span><span class="p">,</span>
-                        <span class="n">dtype</span><span class="o">=</span><span class="n">dimension</span><span class="o">.</span><span class="n">dtype</span><span class="p">)</span>
-                <span class="p">)</span>
+                <span class="n">dimension</span>
+            <span class="p">)</span>
         <span class="k">else</span><span class="p">:</span>
             <span class="k">raise</span> <span class="ne">RuntimeError</span><span class="p">(</span><span class="s2">&quot;Unknown dimension type &quot;</span>
                                <span class="s2">&quot;(</span><span class="si">%s</span><span class="s2">)&quot;</span> <span class="o">%</span> <span class="nb">type</span><span class="p">(</span><span class="n">dimension</span><span class="p">))</span>
@@ -856,10 +842,10 @@ <h1>Source code for skopt.utils</h1><div class="highlight"><pre>
 <span class="sd">    ...                          n_calls=20, base_estimator=&quot;ET&quot;,</span>
 <span class="sd">    ...                          random_state=4)</span>
 <span class="sd">    &gt;&gt;&gt;</span>
-<span class="sd">    &gt;&gt;&gt; # Print the best-found results.</span>
-<span class="sd">    &gt;&gt;&gt; print(&quot;Best fitness:&quot;, result.fun)</span>
+<span class="sd">    &gt;&gt;&gt; # Print the best-found results in same format as the expected result.</span>
+<span class="sd">    &gt;&gt;&gt; print(&quot;Best fitness: &quot; + str(result.fun))</span>
 <span class="sd">    Best fitness: 0.1948080835239698</span>
-<span class="sd">    &gt;&gt;&gt; print(&quot;Best parameters:&quot;, result.x)</span>
+<span class="sd">    &gt;&gt;&gt; print(&quot;Best parameters: {}&quot;.format(result.x))</span>
 <span class="sd">    Best parameters: [0.44134853091052617, 0.06570954323368307, 0.17586123323419825]</span>
 
 <span class="sd">    Parameters</span>

dev/_modules/skopt/plots.html

@@ -183,9 +183,9 @@ and report the value back to the optimizer:
               fun: 0.2071864923643295
         func_vals: array([0.20718649])
            models: []
-     random_state: RandomState(MT19937) at 0x7F0595687640
+     random_state: RandomState(MT19937) at 0x7F9C1AECB640
             space: Space([Real(low=-2.0, high=2.0, prior='uniform', transform='normalize')])
-            specs: {'args': {'self': <skopt.optimizer.optimizer.Optimizer object at 0x7f057647fee0>, 'dimensions': [(-2.0, 2.0)], 'base_estimator': 'GP', 'n_random_starts': None, 'n_initial_points': 10, 'initial_point_generator': 'lhs', 'n_jobs': 1, 'acq_func': 'EI', 'acq_optimizer': 'sampling', 'random_state': None, 'model_queue_size': None, 'acq_func_kwargs': None, 'acq_optimizer_kwargs': None}, 'function': 'Optimizer'}
+            specs: {'args': {'self': <skopt.optimizer.optimizer.Optimizer object at 0x7f9bf7d1afa0>, 'dimensions': [(-2.0, 2.0)], 'base_estimator': 'GP', 'n_random_starts': None, 'n_initial_points': 10, 'initial_point_generator': 'lhs', 'n_jobs': 1, 'acq_func': 'EI', 'acq_optimizer': 'sampling', 'random_state': None, 'model_queue_size': None, 'acq_func_kwargs': None, 'acq_optimizer_kwargs': None}, 'function': 'Optimizer'}
                 x: [-0.7315058981975282]
           x_iters: [[-0.7315058981975282]]
 
@@ -291,7 +291,7 @@ meantime:
 
 .. rst-class:: sphx-glr-timing
 
-   **Total running time of the script:** ( 0 minutes  2.977 seconds)
+   **Total running time of the script:** ( 0 minutes  2.830 seconds)
 
 **Estimated memory usage:**  14 MB
 

dev/_modules/skopt/searchcv.html

@@ -246,11 +246,11 @@ provide the following information:
                              normalize_y=True, random_state=822569775), GaussianProcessRegressor(kernel=1**2 * Matern(length_scale=1, nu=2.5) + WhiteKernel(noise_level=0.01),
                              n_restarts_optimizer=2, noise=0.010000000000000002,
                              normalize_y=True, random_state=822569775)]
-     random_state: RandomState(MT19937) at 0x7F05764D1C40
+     random_state: RandomState(MT19937) at 0x7F9BFDE15C40
             space: Space([Real(low=-2.0, high=2.0, prior='uniform', transform='normalize')])
-            specs: {'args': {'func': <function f at 0x7f057d9dd940>, 'dimensions': Space([Real(low=-2.0, high=2.0, prior='uniform', transform='normalize')]), 'base_estimator': GaussianProcessRegressor(kernel=1**2 * Matern(length_scale=1, nu=2.5),
+            specs: {'args': {'func': <function f at 0x7f9bf5514ee0>, 'dimensions': Space([Real(low=-2.0, high=2.0, prior='uniform', transform='normalize')]), 'base_estimator': GaussianProcessRegressor(kernel=1**2 * Matern(length_scale=1, nu=2.5),
                              n_restarts_optimizer=2, noise=0.010000000000000002,
-                             normalize_y=True, 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 0x7F05764D1C40, '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'}
+                             normalize_y=True, 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 0x7F9BFDE15C40, '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'}
                 x: [0.9015772757452813]
           x_iters: [[-0.009345334109402526], [1.2713537644662787], [0.4484475787090836], [1.0854396754496047], [1.4426790855107496], [1.0722894741900921], [1.1040477623455258], [1.0332536348062722], [0.9564594121745684], [0.9335831126057479], [0.9616485252899714], [0.9464152293452086], [0.9015772757452813], [0.9186215428762252], [0.8568591231716587]]
 
@@ -397,7 +397,7 @@ because the GP does not gain anything more by further exploration:
 
 .. rst-class:: sphx-glr-timing
 
-   **Total running time of the script:** ( 0 minutes  3.233 seconds)
+   **Total running time of the script:** ( 0 minutes  3.167 seconds)
 
 **Estimated memory usage:**  8 MB