Skip to content

Commit

Permalink
deploy: 3e7bdad
Browse files Browse the repository at this point in the history
  • Loading branch information
lbluque committed Jul 24, 2023
1 parent b9d4563 commit f587638
Show file tree
Hide file tree
Showing 37 changed files with 48 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: c7756699bd2c2797ed1f86db2150ee92
config: 3ea440a60f85ee2beffc70f0bfbaccfb
tags: 645f666f9bcd5a90fca523b33c5a78b7
Binary file modified .doctrees/auto_examples/plot_adaptive.doctree
Binary file not shown.
Binary file modified .doctrees/auto_examples/plot_chull.doctree
Binary file not shown.
Binary file modified .doctrees/auto_examples/plot_gl_sgl.doctree
Binary file not shown.
Binary file modified .doctrees/auto_examples/plot_line_search.doctree
Binary file not shown.
Binary file modified .doctrees/auto_examples/plot_one_std.doctree
Binary file not shown.
Binary file modified .doctrees/auto_examples/plot_sparse_signal.doctree
Binary file not shown.
Binary file modified .doctrees/auto_examples/plot_stepwise.doctree
Binary file not shown.
Binary file modified .doctrees/auto_examples/sg_execution_times.doctree
Binary file not shown.
Binary file modified .doctrees/environment.pickle
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified _images/sphx_glr_plot_one_std_001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified _images/sphx_glr_plot_one_std_002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified _images/sphx_glr_plot_one_std_thumb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified _images/sphx_glr_plot_sparse_signal_001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified _images/sphx_glr_plot_sparse_signal_thumb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 3 additions & 4 deletions _modules/sparselm/model_selection.html
Original file line number Diff line number Diff line change
Expand Up @@ -460,10 +460,9 @@ <h1>Source code for sparselm.model_selection</h1><div class="highlight"><pre>
<span class="n">params</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">p</span><span class="p">)</span>
<span class="n">params_sum</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">sum</span><span class="p">(</span><span class="n">params</span><span class="p">,</span> <span class="n">axis</span><span class="o">=</span><span class="mi">0</span><span class="p">)</span>
<span class="n">one_std_dists</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">abs</span><span class="p">(</span><span class="n">metrics</span> <span class="o">-</span> <span class="n">m</span> <span class="o">+</span> <span class="n">sig</span><span class="p">)</span>
<span class="n">candidates</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">arange</span><span class="p">(</span><span class="nb">len</span><span class="p">(</span><span class="n">metrics</span><span class="p">))[</span>
<span class="n">one_std_dists</span> <span class="o">&lt;</span> <span class="p">(</span><span class="n">np</span><span class="o">.</span><span class="n">min</span><span class="p">(</span><span class="n">one_std_dists</span><span class="p">)</span> <span class="o">+</span> <span class="mf">0.1</span> <span class="o">*</span> <span class="n">sig</span><span class="p">)</span>
<span class="p">]</span>
<span class="n">best_index</span> <span class="o">=</span> <span class="n">candidates</span><span class="p">[</span><span class="n">np</span><span class="o">.</span><span class="n">argmax</span><span class="p">(</span><span class="n">params_sum</span><span class="p">[</span><span class="n">candidates</span><span class="p">])]</span>
<span class="c1"># Guarantees that one-std rule always select larger params than max score.</span>
<span class="n">candidates</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">arange</span><span class="p">(</span><span class="nb">len</span><span class="p">(</span><span class="n">metrics</span><span class="p">))[</span><span class="n">params_sum</span> <span class="o">&gt;=</span> <span class="n">params_sum</span><span class="p">[</span><span class="n">opt_index</span><span class="p">]]</span>
<span class="n">best_index</span> <span class="o">=</span> <span class="n">candidates</span><span class="p">[</span><span class="n">np</span><span class="o">.</span><span class="n">argmin</span><span class="p">(</span><span class="n">one_std_dists</span><span class="p">[</span><span class="n">candidates</span><span class="p">])]</span>
<span class="k">return</span> <span class="n">best_index</span>

<span class="c1"># Overwrite original fit method to allow multiple optimal methods.</span>
Expand Down
2 changes: 1 addition & 1 deletion _sources/auto_examples/plot_adaptive.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ this example we compare the performance of the standard Lasso with adaptive Lass
.. rst-class:: sphx-glr-timing

**Total running time of the script:** ( 0 minutes 3.583 seconds)
**Total running time of the script:** ( 0 minutes 3.061 seconds)


.. _sphx_glr_download_auto_examples_plot_adaptive.py:
Expand Down
2 changes: 1 addition & 1 deletion _sources/auto_examples/plot_chull.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ tutorial: https://icet.materialsmodeling.org/tutorial.zip for the
.. rst-class:: sphx-glr-timing

**Total running time of the script:** ( 0 minutes 3.720 seconds)
**Total running time of the script:** ( 0 minutes 2.773 seconds)


.. _sphx_glr_download_auto_examples_plot_chull.py:
Expand Down
2 changes: 1 addition & 1 deletion _sources/auto_examples/plot_gl_sgl.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ dataset with group-level sparsity and within-group sparsity.
.. rst-class:: sphx-glr-timing

**Total running time of the script:** ( 0 minutes 20.218 seconds)
**Total running time of the script:** ( 0 minutes 16.990 seconds)


.. _sphx_glr_download_auto_examples_plot_gl_sgl.py:
Expand Down
2 changes: 1 addition & 1 deletion _sources/auto_examples/plot_line_search.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ This example also showcases the usage of mixed L0 regressor.
.. rst-class:: sphx-glr-timing

**Total running time of the script:** ( 0 minutes 26.603 seconds)
**Total running time of the script:** ( 0 minutes 18.701 seconds)


.. _sphx_glr_download_auto_examples_plot_line_search.py:
Expand Down
12 changes: 6 additions & 6 deletions _sources/auto_examples/plot_one_std.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ under sparselm.model_selection.
.. code-block:: none
Lasso with 1-std performance metrics:
train r2: 0.975
test r2: 0.954
train rmse: 33.629
test rmse: 41.532
sparsity: 41
train r2: 0.961
test r2: 0.945
train rmse: 42.082
test rmse: 45.472
sparsity: 15
Lasso performance metrics:
train r2: 0.969
test r2: 0.952
Expand Down Expand Up @@ -177,7 +177,7 @@ under sparselm.model_selection.
.. rst-class:: sphx-glr-timing

**Total running time of the script:** ( 0 minutes 0.594 seconds)
**Total running time of the script:** ( 0 minutes 0.368 seconds)


.. _sphx_glr_download_auto_examples_plot_one_std.py:
Expand Down
2 changes: 1 addition & 1 deletion _sources/auto_examples/plot_sparse_signal.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ https://scikit-learn.org/stable/auto_examples/linear_model/plot_omp.html#sphx-gl
.. rst-class:: sphx-glr-timing

**Total running time of the script:** ( 0 minutes 3.819 seconds)
**Total running time of the script:** ( 0 minutes 3.627 seconds)


.. _sphx_glr_download_auto_examples_plot_sparse_signal.py:
Expand Down
2 changes: 1 addition & 1 deletion _sources/auto_examples/plot_stepwise.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ of energy to other cluster interactions.
.. rst-class:: sphx-glr-timing

**Total running time of the script:** ( 0 minutes 0.657 seconds)
**Total running time of the script:** ( 0 minutes 0.432 seconds)


.. _sphx_glr_download_auto_examples_plot_stepwise.py:
Expand Down
16 changes: 8 additions & 8 deletions _sources/auto_examples/sg_execution_times.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@

Computation times
=================
**00:59.195** total execution time for **auto_examples** files:
**00:45.952** total execution time for **auto_examples** files:

+---------------------------------------------------------------------------------+-----------+--------+
| :ref:`sphx_glr_auto_examples_plot_line_search.py` (``plot_line_search.py``) | 00:26.603 | 0.0 MB |
| :ref:`sphx_glr_auto_examples_plot_line_search.py` (``plot_line_search.py``) | 00:18.701 | 0.0 MB |
+---------------------------------------------------------------------------------+-----------+--------+
| :ref:`sphx_glr_auto_examples_plot_gl_sgl.py` (``plot_gl_sgl.py``) | 00:20.218 | 0.0 MB |
| :ref:`sphx_glr_auto_examples_plot_gl_sgl.py` (``plot_gl_sgl.py``) | 00:16.990 | 0.0 MB |
+---------------------------------------------------------------------------------+-----------+--------+
| :ref:`sphx_glr_auto_examples_plot_sparse_signal.py` (``plot_sparse_signal.py``) | 00:03.819 | 0.0 MB |
| :ref:`sphx_glr_auto_examples_plot_sparse_signal.py` (``plot_sparse_signal.py``) | 00:03.627 | 0.0 MB |
+---------------------------------------------------------------------------------+-----------+--------+
| :ref:`sphx_glr_auto_examples_plot_chull.py` (``plot_chull.py``) | 00:03.720 | 0.0 MB |
| :ref:`sphx_glr_auto_examples_plot_adaptive.py` (``plot_adaptive.py``) | 00:03.061 | 0.0 MB |
+---------------------------------------------------------------------------------+-----------+--------+
| :ref:`sphx_glr_auto_examples_plot_adaptive.py` (``plot_adaptive.py``) | 00:03.583 | 0.0 MB |
| :ref:`sphx_glr_auto_examples_plot_chull.py` (``plot_chull.py``) | 00:02.773 | 0.0 MB |
+---------------------------------------------------------------------------------+-----------+--------+
| :ref:`sphx_glr_auto_examples_plot_stepwise.py` (``plot_stepwise.py``) | 00:00.657 | 0.0 MB |
| :ref:`sphx_glr_auto_examples_plot_stepwise.py` (``plot_stepwise.py``) | 00:00.432 | 0.0 MB |
+---------------------------------------------------------------------------------+-----------+--------+
| :ref:`sphx_glr_auto_examples_plot_one_std.py` (``plot_one_std.py``) | 00:00.594 | 0.0 MB |
| :ref:`sphx_glr_auto_examples_plot_one_std.py` (``plot_one_std.py``) | 00:00.368 | 0.0 MB |
+---------------------------------------------------------------------------------+-----------+--------+
2 changes: 1 addition & 1 deletion _static/documentation_options.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var DOCUMENTATION_OPTIONS = {
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
VERSION: '0.1.dev1+gf7bedb3',
VERSION: '0.1.dev1+g3e7bdad',
LANGUAGE: 'en',
COLLAPSE_INDEX: false,
BUILDER: 'html',
Expand Down
2 changes: 1 addition & 1 deletion auto_examples/plot_adaptive.html
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@
<span class="n">fig</span><span class="o">.</span><span class="n">show</span><span class="p">()</span>
</pre></div>
</div>
<p class="sphx-glr-timing"><strong>Total running time of the script:</strong> ( 0 minutes 3.583 seconds)</p>
<p class="sphx-glr-timing"><strong>Total running time of the script:</strong> ( 0 minutes 3.061 seconds)</p>
<div class="sphx-glr-footer sphx-glr-footer-example docutils container" id="sphx-glr-download-auto-examples-plot-adaptive-py">
<div class="sphx-glr-download sphx-glr-download-python docutils container">
<p><a class="reference download internal" download="" href="../_downloads/4e20a334cb964e28ad034553682e0e5e/plot_adaptive.py"><code class="xref download docutils literal notranslate"><span class="pre">Download</span> <span class="pre">Python</span> <span class="pre">source</span> <span class="pre">code:</span> <span class="pre">plot_adaptive.py</span></code></a></p>
Expand Down
2 changes: 1 addition & 1 deletion auto_examples/plot_chull.html
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@
<span class="nb">print</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;L2L0 with constraings train RMSE: </span><span class="si">{</span><a href="https://numpy.org/doc/stable/reference/arrays.scalars.html#numpy.float64" title="numpy.float64" class="sphx-glr-backref-module-numpy sphx-glr-backref-type-py-attribute"><span class="n">l2l0c_rmse</span></a><span class="si">:</span><span class="s2">.4f</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span>
</pre></div>
</div>
<p class="sphx-glr-timing"><strong>Total running time of the script:</strong> ( 0 minutes 3.720 seconds)</p>
<p class="sphx-glr-timing"><strong>Total running time of the script:</strong> ( 0 minutes 2.773 seconds)</p>
<div class="sphx-glr-footer sphx-glr-footer-example docutils container" id="sphx-glr-download-auto-examples-plot-chull-py">
<div class="sphx-glr-download sphx-glr-download-python docutils container">
<p><a class="reference download internal" download="" href="../_downloads/0b537d47053d1510a977109460626422/plot_chull.py"><code class="xref download docutils literal notranslate"><span class="pre">Download</span> <span class="pre">Python</span> <span class="pre">source</span> <span class="pre">code:</span> <span class="pre">plot_chull.py</span></code></a></p>
Expand Down
2 changes: 1 addition & 1 deletion auto_examples/plot_gl_sgl.html
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@
<span class="nb">print</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot; test rmse: </span><span class="si">{</span><a href="https://docs.python.org/3.9/library/stdtypes.html#dict" title="builtins.dict" class="sphx-glr-backref-module-builtins sphx-glr-backref-type-py-class sphx-glr-backref-instance"><span class="n">sglasso_test</span></a><span class="p">[</span><span class="s1">&#39;rmse&#39;</span><span class="p">]</span><span class="si">:</span><span class="s2">.3f</span><span class="si">}</span><span class="s2">&quot;</span><span class="p">)</span>
</pre></div>
</div>
<p class="sphx-glr-timing"><strong>Total running time of the script:</strong> ( 0 minutes 20.218 seconds)</p>
<p class="sphx-glr-timing"><strong>Total running time of the script:</strong> ( 0 minutes 16.990 seconds)</p>
<div class="sphx-glr-footer sphx-glr-footer-example docutils container" id="sphx-glr-download-auto-examples-plot-gl-sgl-py">
<div class="sphx-glr-download sphx-glr-download-python docutils container">
<p><a class="reference download internal" download="" href="../_downloads/d80fbc936f3cb8d9e602dcc4435647cc/plot_gl_sgl.py"><code class="xref download docutils literal notranslate"><span class="pre">Download</span> <span class="pre">Python</span> <span class="pre">source</span> <span class="pre">code:</span> <span class="pre">plot_gl_sgl.py</span></code></a></p>
Expand Down
2 changes: 1 addition & 1 deletion auto_examples/plot_line_search.html
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@
<span class="n">fig</span><span class="o">.</span><span class="n">show</span><span class="p">()</span>
</pre></div>
</div>
<p class="sphx-glr-timing"><strong>Total running time of the script:</strong> ( 0 minutes 26.603 seconds)</p>
<p class="sphx-glr-timing"><strong>Total running time of the script:</strong> ( 0 minutes 18.701 seconds)</p>
<div class="sphx-glr-footer sphx-glr-footer-example docutils container" id="sphx-glr-download-auto-examples-plot-line-search-py">
<div class="sphx-glr-download sphx-glr-download-python docutils container">
<p><a class="reference download internal" download="" href="../_downloads/39a83300f446e639cdeb32321aaa210b/plot_line_search.py"><code class="xref download docutils literal notranslate"><span class="pre">Download</span> <span class="pre">Python</span> <span class="pre">source</span> <span class="pre">code:</span> <span class="pre">plot_line_search.py</span></code></a></p>
Expand Down
12 changes: 6 additions & 6 deletions auto_examples/plot_one_std.html
Original file line number Diff line number Diff line change
Expand Up @@ -264,11 +264,11 @@
<li><img src="../_images/sphx_glr_plot_one_std_002.png" srcset="../_images/sphx_glr_plot_one_std_002.png" alt="plot one std" class = "sphx-glr-multi-img"/></li>
</ul>
<div class="sphx-glr-script-out highlight-none notranslate"><div class="highlight"><pre><span></span>Lasso with 1-std performance metrics:
train r2: 0.975
test r2: 0.954
train rmse: 33.629
test rmse: 41.532
sparsity: 41
train r2: 0.961
test r2: 0.945
train rmse: 42.082
test rmse: 45.472
sparsity: 15
Lasso performance metrics:
train r2: 0.969
test r2: 0.952
Expand Down Expand Up @@ -376,7 +376,7 @@
<span class="n">fig</span><span class="o">.</span><span class="n">show</span><span class="p">()</span>
</pre></div>
</div>
<p class="sphx-glr-timing"><strong>Total running time of the script:</strong> ( 0 minutes 0.594 seconds)</p>
<p class="sphx-glr-timing"><strong>Total running time of the script:</strong> ( 0 minutes 0.368 seconds)</p>
<div class="sphx-glr-footer sphx-glr-footer-example docutils container" id="sphx-glr-download-auto-examples-plot-one-std-py">
<div class="sphx-glr-download sphx-glr-download-python docutils container">
<p><a class="reference download internal" download="" href="../_downloads/94b591974c51db0a8a46734034e1c825/plot_one_std.py"><code class="xref download docutils literal notranslate"><span class="pre">Download</span> <span class="pre">Python</span> <span class="pre">source</span> <span class="pre">code:</span> <span class="pre">plot_one_std.py</span></code></a></p>
Expand Down
2 changes: 1 addition & 1 deletion auto_examples/plot_sparse_signal.html
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@
<span class="n">plt</span><span class="o">.</span><span class="n">show</span><span class="p">()</span>
</pre></div>
</div>
<p class="sphx-glr-timing"><strong>Total running time of the script:</strong> ( 0 minutes 3.819 seconds)</p>
<p class="sphx-glr-timing"><strong>Total running time of the script:</strong> ( 0 minutes 3.627 seconds)</p>
<div class="sphx-glr-footer sphx-glr-footer-example docutils container" id="sphx-glr-download-auto-examples-plot-sparse-signal-py">
<div class="sphx-glr-download sphx-glr-download-python docutils container">
<p><a class="reference download internal" download="" href="../_downloads/74df2f6cd28e06f7390261b69d55ceaf/plot_sparse_signal.py"><code class="xref download docutils literal notranslate"><span class="pre">Download</span> <span class="pre">Python</span> <span class="pre">source</span> <span class="pre">code:</span> <span class="pre">plot_sparse_signal.py</span></code></a></p>
Expand Down
2 changes: 1 addition & 1 deletion auto_examples/plot_stepwise.html
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@
<span class="n">fig</span><span class="o">.</span><span class="n">show</span><span class="p">()</span>
</pre></div>
</div>
<p class="sphx-glr-timing"><strong>Total running time of the script:</strong> ( 0 minutes 0.657 seconds)</p>
<p class="sphx-glr-timing"><strong>Total running time of the script:</strong> ( 0 minutes 0.432 seconds)</p>
<div class="sphx-glr-footer sphx-glr-footer-example docutils container" id="sphx-glr-download-auto-examples-plot-stepwise-py">
<div class="sphx-glr-download sphx-glr-download-python docutils container">
<p><a class="reference download internal" download="" href="../_downloads/316c1bee37a03ef94b4f109bed7d06c8/plot_stepwise.py"><code class="xref download docutils literal notranslate"><span class="pre">Download</span> <span class="pre">Python</span> <span class="pre">source</span> <span class="pre">code:</span> <span class="pre">plot_stepwise.py</span></code></a></p>
Expand Down
Loading

0 comments on commit f587638

Please sign in to comment.