Skip to content

Commit 26ba9cf

Browse files
authored
Use interactive plotly figures in docs (#620)
1 parent aa9a93c commit 26ba9cf

13 files changed

Lines changed: 70 additions & 30 deletions

docs/rtd_environment.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ dependencies:
3232
- pygmo>=2.19.0
3333
- pip:
3434
- ../
35-
- kaleido>=1.0
3635
- Py-BOBYQA
3736
- DFO-LS
3837
- pandas-stubs # dev, tests

docs/source/_static/js/require.js

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/source/conf.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,11 @@
171171
# "default.css" will overwrite the built-in "default.css".
172172
html_css_files = ["css/termynal.css", "css/termynal_custom.css", "css/custom.css"]
173173

174-
html_js_files = ["js/termynal.js", "js/custom.js"]
174+
html_js_files = [
175+
"js/termynal.js",
176+
"js/custom.js",
177+
"js/require.js",
178+
]
175179

176180

177181
# Add any paths that contain custom static files (such as style sheets) here, relative

docs/source/estimagic/tutorials/msm_overview.ipynb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@
4444
"source": [
4545
"import numpy as np\n",
4646
"import pandas as pd\n",
47+
"import plotly.io as pio\n",
48+
"\n",
49+
"pio.renderers.default = \"notebook_connected\"\n",
4750
"\n",
4851
"import estimagic as em\n",
4952
"\n",
@@ -307,7 +310,7 @@
307310
"fig = lollipop_plot(sensitivity_data)\n",
308311
"\n",
309312
"fig = fig.update_layout(height=500, width=900)\n",
310-
"fig.show(renderer=\"png\")"
313+
"fig.show()"
311314
]
312315
}
313316
],

docs/source/how_to/how_to_algorithm_selection.ipynb

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,11 @@
144144
"source": [
145145
"import warnings\n",
146146
"\n",
147-
"warnings.filterwarnings(\"ignore\")"
147+
"warnings.filterwarnings(\"ignore\")\n",
148+
"\n",
149+
"import plotly.io as pio\n",
150+
"\n",
151+
"pio.renderers.default = \"notebook_connected\""
148152
]
149153
},
150154
{
@@ -221,7 +225,7 @@
221225
" )\n",
222226
"\n",
223227
"fig = om.criterion_plot(results, max_evaluations=8)\n",
224-
"fig.show(renderer=\"png\")"
228+
"fig.show()"
225229
]
226230
},
227231
{
@@ -270,7 +274,7 @@
270274
"outputs": [],
271275
"source": [
272276
"fig = om.criterion_plot(results)\n",
273-
"fig.show(renderer=\"png\")"
277+
"fig.show()"
274278
]
275279
},
276280
{
@@ -320,7 +324,7 @@
320324
" )\n",
321325
"\n",
322326
"fig = om.criterion_plot(results)\n",
323-
"fig.show(renderer=\"png\")"
327+
"fig.show()"
324328
]
325329
},
326330
{

docs/source/how_to/how_to_benchmarking.ipynb

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@
4040
"metadata": {},
4141
"outputs": [],
4242
"source": [
43+
"import plotly.io as pio\n",
44+
"\n",
45+
"pio.renderers.default = \"notebook_connected\"\n",
46+
"\n",
4347
"import optimagic as om"
4448
]
4549
},
@@ -124,7 +128,7 @@
124128
" results=results,\n",
125129
")\n",
126130
"\n",
127-
"fig.show(renderer=\"png\")"
131+
"fig.show()"
128132
]
129133
},
130134
{
@@ -158,7 +162,7 @@
158162
" x_precision=0.001,\n",
159163
")\n",
160164
"\n",
161-
"fig.show(renderer=\"png\")"
165+
"fig.show()"
162166
]
163167
},
164168
{
@@ -185,7 +189,7 @@
185189
" problem_subset=[\"rosenbrock_good_start\", \"box_3d\"],\n",
186190
")\n",
187191
"\n",
188-
"fig.show(renderer=\"png\")"
192+
"fig.show()"
189193
]
190194
},
191195
{
@@ -214,7 +218,7 @@
214218
" stopping_criterion=\"x\",\n",
215219
")\n",
216220
"\n",
217-
"fig.show(renderer=\"png\")"
221+
"fig.show()"
218222
]
219223
},
220224
{

docs/source/how_to/how_to_derivatives.ipynb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
"outputs": [],
3939
"source": [
4040
"import numpy as np\n",
41+
"import plotly.io as pio\n",
42+
"\n",
43+
"pio.renderers.default = \"notebook_connected\"\n",
4144
"\n",
4245
"import optimagic as om\n",
4346
"\n",
@@ -245,7 +248,7 @@
245248
" )\n",
246249
"\n",
247250
"fig = om.criterion_plot(results)\n",
248-
"fig.show(renderer=\"png\")"
251+
"fig.show()"
249252
]
250253
},
251254
{

docs/source/how_to/how_to_errors_during_optimization.ipynb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,11 @@
4949
"import warnings\n",
5050
"\n",
5151
"import numpy as np\n",
52+
"import plotly.io as pio\n",
5253
"from scipy.optimize import minimize as scipy_minimize\n",
5354
"\n",
55+
"pio.renderers.default = \"notebook_connected\"\n",
56+
"\n",
5457
"import optimagic as om\n",
5558
"\n",
5659
"warnings.simplefilter(\"ignore\")"
@@ -217,7 +220,7 @@
217220
"fig = go.Figure()\n",
218221
"fig.add_trace(go.Scatter(x=grid, y=values))\n",
219222
"fig.add_trace(go.Scatter(x=grid, y=dummy_values))\n",
220-
"fig.show(renderer=\"png\")"
223+
"fig.show()"
221224
]
222225
},
223226
{

docs/source/how_to/how_to_logging.ipynb

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
"from pathlib import Path\n",
3131
"\n",
3232
"import numpy as np\n",
33+
"import plotly.io as pio\n",
34+
"\n",
35+
"pio.renderers.default = \"notebook_connected\"\n",
3336
"\n",
3437
"import optimagic as om"
3538
]
@@ -217,7 +220,7 @@
217220
"outputs": [],
218221
"source": [
219222
"fig = om.criterion_plot(\"my_log.db\")\n",
220-
"fig.show(renderer=\"png\")"
223+
"fig.show()"
221224
]
222225
},
223226
{
@@ -227,7 +230,7 @@
227230
"outputs": [],
228231
"source": [
229232
"fig = om.params_plot(\"my_log.db\", selector=lambda x: x[1:3])\n",
230-
"fig.show(renderer=\"png\")"
233+
"fig.show()"
231234
]
232235
}
233236
],

docs/source/how_to/how_to_multistart.ipynb

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
"outputs": [],
3737
"source": [
3838
"import numpy as np\n",
39+
"import plotly.io as pio\n",
40+
"\n",
41+
"pio.renderers.default = \"notebook_connected\"\n",
3942
"\n",
4043
"import optimagic as om\n",
4144
"\n",
@@ -127,7 +130,7 @@
127130
")\n",
128131
"\n",
129132
"fig = om.criterion_plot(res, monotone=True)\n",
130-
"fig.show(\"png\")"
133+
"fig.show()"
131134
]
132135
},
133136
{
@@ -178,7 +181,7 @@
178181
")\n",
179182
"\n",
180183
"fig = om.criterion_plot(res)\n",
181-
"fig.show(\"png\")"
184+
"fig.show()"
182185
]
183186
},
184187
{

0 commit comments

Comments
 (0)