python: introduce spot.jupyter.display_inline()
* python/spot/jupyter.py: New file. * python/Makefile.am: Add it. * tests/python/product.ipynb: Use it. * NEWS: Mention it.
This commit is contained in:
parent
b0b431a5a4
commit
58d9a12495
4 changed files with 1131 additions and 993 deletions
5
NEWS
5
NEWS
|
|
@ -60,6 +60,11 @@ New in spot 2.5.3.dev (not yet released)
|
||||||
options; there are demonstrated on the new
|
options; there are demonstrated on the new
|
||||||
https://spot.lrde.epita.fr/ipynb/satmin.html page.
|
https://spot.lrde.epita.fr/ipynb/satmin.html page.
|
||||||
|
|
||||||
|
Python:
|
||||||
|
|
||||||
|
- New spot.jupyter package. This currently contains a function for
|
||||||
|
displaying several argument side by side in a Jupyter notebook.
|
||||||
|
|
||||||
Bugs fixed:
|
Bugs fixed:
|
||||||
|
|
||||||
- print_dot() will correctly escape strings containing \n in HTML
|
- print_dot() will correctly escape strings containing \n in HTML
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
## -*- coding: utf-8 -*-
|
## -*- coding: utf-8 -*-
|
||||||
## Copyright (C) 2010, 2011, 2013-2017 Laboratoire de Recherche
|
## Copyright (C) 2010, 2011, 2013-2018 Laboratoire de Recherche
|
||||||
## et Development de l'Epita (LRDE).
|
## et Development de l'Epita (LRDE).
|
||||||
## Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
|
## Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||||
## département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
## département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
||||||
|
|
@ -41,6 +41,7 @@ nobase_python_PYTHON = \
|
||||||
spot/impl.py \
|
spot/impl.py \
|
||||||
spot/ltsmin.py \
|
spot/ltsmin.py \
|
||||||
spot/gen.py \
|
spot/gen.py \
|
||||||
|
spot/jupyter.py \
|
||||||
buddy.py
|
buddy.py
|
||||||
nobase_pyexec_LTLIBRARIES = _buddy.la spot/_impl.la \
|
nobase_pyexec_LTLIBRARIES = _buddy.la spot/_impl.la \
|
||||||
spot/_ltsmin.la spot/_gen.la
|
spot/_ltsmin.la spot/_gen.la
|
||||||
|
|
|
||||||
51
python/spot/jupyter.py
Normal file
51
python/spot/jupyter.py
Normal file
|
|
@ -0,0 +1,51 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Copyright (C) 2018 Laboratoire de Recherche et Développement de l'Epita
|
||||||
|
# (LRDE).
|
||||||
|
#
|
||||||
|
# This file is part of Spot, a model checking library.
|
||||||
|
#
|
||||||
|
# Spot is free software; you can redistribute it and/or modify it
|
||||||
|
# under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# Spot is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||||
|
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
||||||
|
# License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
"""
|
||||||
|
Auxiliary functions for Spot's Python bindings.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from IPython.display import display, HTML
|
||||||
|
|
||||||
|
def display_inline(*args, per_row=None):
|
||||||
|
"""
|
||||||
|
This is a wrapper around IPython's `display()` to display multiple
|
||||||
|
elements in a row, without forced line break between them.
|
||||||
|
|
||||||
|
If the `per_row` argument is given, at most `per_row` arguments are
|
||||||
|
displayed on each row, each one taking 1/per_row of the line width.
|
||||||
|
"""
|
||||||
|
width = res = ''
|
||||||
|
if per_row:
|
||||||
|
width = 'width:{}%;'.format(100//per_row)
|
||||||
|
for arg in args:
|
||||||
|
dpy = 'inline-block'
|
||||||
|
if hasattr(arg, '_repr_svg_'):
|
||||||
|
rep = arg._repr_svg_()
|
||||||
|
elif hasattr(arg, '_repr_html_'):
|
||||||
|
rep = arg._repr_html_()
|
||||||
|
elif hasattr(arg, '_repr_latex_'):
|
||||||
|
rep = arg._repr_latex_()
|
||||||
|
if not per_row:
|
||||||
|
dpy = 'inline'
|
||||||
|
else:
|
||||||
|
rep = str(arg)
|
||||||
|
res += ("<div style='vertical-align:text-top;display:{};{}'>{}</div>"
|
||||||
|
.format(dpy, width, rep))
|
||||||
|
display(HTML(res))
|
||||||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue