Skip to content

Commit

Permalink
Adds 0.1.7 release notes and bumps version
Browse files Browse the repository at this point in the history
  • Loading branch information
erp12 committed Jun 16, 2020
1 parent 733783a commit 8a9360b
Show file tree
Hide file tree
Showing 23 changed files with 342 additions and 94 deletions.
Binary file modified docs/doctrees/api.doctree
Binary file not shown.
Binary file modified docs/doctrees/api/gp.doctree
Binary file not shown.
Binary file modified docs/doctrees/api/push.doctree
Binary file not shown.
Binary file modified docs/doctrees/environment.pickle
Binary file not shown.
Binary file modified docs/doctrees/overview.doctree
Binary file not shown.
Binary file modified docs/doctrees/release_notes.doctree
Binary file not shown.
10 changes: 6 additions & 4 deletions docs/html/_modules/pyshgp/gp/estimators.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ <h1>Source code for pyshgp.gp.estimators</h1><div class="highlight"><pre>
<span class="kn">from</span> <span class="nn">pyshgp.push.interpreter</span> <span class="kn">import</span> <span class="n">PushInterpreter</span><span class="p">,</span> <span class="n">DEFAULT_INTERPRETER</span>
<span class="kn">from</span> <span class="nn">pyshgp.push.config</span> <span class="kn">import</span> <span class="n">PushConfig</span>
<span class="kn">from</span> <span class="nn">pyshgp.push.program</span> <span class="kn">import</span> <span class="n">ProgramSignature</span>
<span class="kn">from</span> <span class="nn">pyshgp.tap</span> <span class="kn">import</span> <span class="n">tap</span>
<span class="kn">from</span> <span class="nn">pyshgp.tap</span> <span class="kn">import</span> <span class="n">tap</span><span class="p">,</span> <span class="n">set_verbosity</span>
<span class="kn">from</span> <span class="nn">pyshgp.utils</span> <span class="kn">import</span> <span class="n">list_rindex</span>
<span class="kn">from</span> <span class="nn">pyshgp.validation</span> <span class="kn">import</span> <span class="n">check_is_fitted</span><span class="p">,</span> <span class="n">check_X_y</span>

Expand Down Expand Up @@ -127,6 +127,7 @@ <h1>Source code for pyshgp.gp.estimators</h1><div class="highlight"><pre>
<span class="bp">self</span><span class="o">.</span><span class="n">parallelism</span> <span class="o">=</span> <span class="n">parallelism</span>
<span class="bp">self</span><span class="o">.</span><span class="n">verbose</span> <span class="o">=</span> <span class="n">verbose</span>
<span class="bp">self</span><span class="o">.</span><span class="n">ext</span> <span class="o">=</span> <span class="n">kwargs</span>
<span class="n">set_verbosity</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">verbose</span><span class="p">)</span>

<span class="c1"># Initialize attributes that will be set later.</span>
<span class="bp">self</span><span class="o">.</span><span class="n">evaluator</span> <span class="o">=</span> <span class="kc">None</span>
Expand Down Expand Up @@ -163,8 +164,7 @@ <h1>Source code for pyshgp.gp.estimators</h1><div class="highlight"><pre>
<span class="n">initial_genome_size</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">initial_genome_size</span><span class="p">,</span>
<span class="n">simplification_steps</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">simplification_steps</span><span class="p">,</span>
<span class="n">parallelism</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">parallelism</span><span class="p">,</span>
<span class="n">push_config</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">push_config</span><span class="p">,</span>
<span class="n">verbose</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">verbose</span>
<span class="n">push_config</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">push_config</span>
<span class="p">)</span>
<span class="bp">self</span><span class="o">.</span><span class="n">search</span> <span class="o">=</span> <span class="n">sr</span><span class="o">.</span><span class="n">get_search_algo</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_search_name</span><span class="p">,</span> <span class="n">config</span><span class="o">=</span><span class="n">search_config</span><span class="p">,</span> <span class="o">**</span><span class="bp">self</span><span class="o">.</span><span class="n">ext</span><span class="p">)</span>

Expand All @@ -190,7 +190,9 @@ <h1>Source code for pyshgp.gp.estimators</h1><div class="highlight"><pre>
<span class="bp">self</span><span class="o">.</span><span class="n">signature</span> <span class="o">=</span> <span class="n">ProgramSignature</span><span class="p">(</span><span class="n">arity</span><span class="o">=</span><span class="n">arity</span><span class="p">,</span> <span class="n">output_stacks</span><span class="o">=</span><span class="n">output_types</span><span class="p">,</span> <span class="n">push_config</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">push_config</span><span class="p">)</span>
<span class="bp">self</span><span class="o">.</span><span class="n">evaluator</span> <span class="o">=</span> <span class="n">DatasetEvaluator</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">interpreter</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">interpreter</span><span class="p">)</span>
<span class="bp">self</span><span class="o">.</span><span class="n">_build_search_algo</span><span class="p">()</span>
<span class="bp">self</span><span class="o">.</span><span class="n">solution</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">search</span><span class="o">.</span><span class="n">run</span><span class="p">()</span></div>
<span class="bp">self</span><span class="o">.</span><span class="n">solution</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">search</span><span class="o">.</span><span class="n">run</span><span class="p">()</span>
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">search</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">parallel_context</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
<span class="bp">self</span><span class="o">.</span><span class="n">search</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">parallel_context</span><span class="o">.</span><span class="n">pool</span><span class="o">.</span><span class="n">close</span><span class="p">()</span></div>

<div class="viewcode-block" id="PushEstimator.predict"><a class="viewcode-back" href="../../../api/gp.html#pyshgp.gp.estimators.PushEstimator.predict">[docs]</a> <span class="k">def</span> <span class="nf">predict</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="sd">&quot;&quot;&quot;Execute the synthesized push program on a dataset.</span>
Expand Down
5 changes: 1 addition & 4 deletions docs/html/_modules/pyshgp/gp/search.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ <h1>Source code for pyshgp.gp.search</h1><div class="highlight"><pre>
<span class="kn">from</span> <span class="nn">multiprocessing</span> <span class="kn">import</span> <span class="n">Pool</span><span class="p">,</span> <span class="n">Manager</span>

<span class="kn">from</span> <span class="nn">pyshgp.push.program</span> <span class="kn">import</span> <span class="n">ProgramSignature</span>
<span class="kn">from</span> <span class="nn">pyshgp.tap</span> <span class="kn">import</span> <span class="n">tap</span><span class="p">,</span> <span class="n">set_verbosity</span>
<span class="kn">from</span> <span class="nn">pyshgp.tap</span> <span class="kn">import</span> <span class="n">tap</span>
<span class="kn">from</span> <span class="nn">pyshgp.utils</span> <span class="kn">import</span> <span class="n">DiscreteProbDistrib</span>
<span class="kn">from</span> <span class="nn">pyshgp.gp.evaluation</span> <span class="kn">import</span> <span class="n">Evaluator</span>
<span class="kn">from</span> <span class="nn">pyshgp.gp.genome</span> <span class="kn">import</span> <span class="n">GeneSpawner</span><span class="p">,</span> <span class="n">GenomeSimplifier</span>
Expand Down Expand Up @@ -127,7 +127,6 @@ <h1>Source code for pyshgp.gp.search</h1><div class="highlight"><pre>
<span class="n">initial_genome_size</span><span class="p">:</span> <span class="n">Tuple</span><span class="p">[</span><span class="nb">int</span><span class="p">,</span> <span class="nb">int</span><span class="p">]</span> <span class="o">=</span> <span class="p">(</span><span class="mi">10</span><span class="p">,</span> <span class="mi">50</span><span class="p">),</span>
<span class="n">simplification_steps</span><span class="p">:</span> <span class="nb">int</span> <span class="o">=</span> <span class="mi">2000</span><span class="p">,</span>
<span class="n">parallelism</span><span class="p">:</span> <span class="n">Union</span><span class="p">[</span><span class="nb">int</span><span class="p">,</span> <span class="nb">bool</span><span class="p">]</span> <span class="o">=</span> <span class="kc">True</span><span class="p">,</span>
<span class="n">verbose</span><span class="p">:</span> <span class="nb">int</span> <span class="o">=</span> <span class="mi">0</span><span class="p">,</span>
<span class="o">**</span><span class="n">kwargs</span><span class="p">):</span>
<span class="bp">self</span><span class="o">.</span><span class="n">signature</span> <span class="o">=</span> <span class="n">signature</span>
<span class="bp">self</span><span class="o">.</span><span class="n">evaluator</span> <span class="o">=</span> <span class="n">evaluator</span>
Expand All @@ -137,9 +136,7 @@ <h1>Source code for pyshgp.gp.search</h1><div class="highlight"><pre>
<span class="bp">self</span><span class="o">.</span><span class="n">error_threshold</span> <span class="o">=</span> <span class="n">error_threshold</span>
<span class="bp">self</span><span class="o">.</span><span class="n">initial_genome_size</span> <span class="o">=</span> <span class="n">initial_genome_size</span>
<span class="bp">self</span><span class="o">.</span><span class="n">simplification_steps</span> <span class="o">=</span> <span class="n">simplification_steps</span>
<span class="bp">self</span><span class="o">.</span><span class="n">verbose</span> <span class="o">=</span> <span class="n">verbose</span>
<span class="bp">self</span><span class="o">.</span><span class="n">ext</span> <span class="o">=</span> <span class="n">kwargs</span>
<span class="n">set_verbosity</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">verbose</span><span class="p">)</span>

<span class="bp">self</span><span class="o">.</span><span class="n">parallel_context</span> <span class="o">=</span> <span class="kc">None</span>
<span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">parallelism</span><span class="p">,</span> <span class="nb">bool</span><span class="p">):</span>
Expand Down
1 change: 1 addition & 0 deletions docs/html/_modules/pyshgp/gp/selection.html
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ <h1>Source code for pyshgp.gp.selection</h1><div class="highlight"><pre>
<span class="k">pass</span></div>

<div class="viewcode-block" id="Selector.select"><a class="viewcode-back" href="../../../api/gp.html#pyshgp.gp.selection.Selector.select">[docs]</a> <span class="nd">@tap</span>
<span class="nd">@abstractmethod</span>
<span class="k">def</span> <span class="nf">select</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">population</span><span class="p">:</span> <span class="n">Population</span><span class="p">,</span> <span class="n">n</span><span class="p">:</span> <span class="nb">int</span> <span class="o">=</span> <span class="mi">1</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="n">Sequence</span><span class="p">[</span><span class="n">Individual</span><span class="p">]:</span>
<span class="sd">&quot;&quot;&quot;Return `n` individuals from the population.</span>

Expand Down
Loading

0 comments on commit 8a9360b

Please sign in to comment.