alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into next

Browse source
This commit is contained in:
Alexandre Duret-Lutz 2022-05-18 09:00:36 +02:00
commit 3b8e11322b
4 changed files with 34 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
NEWS
View file

@ -1,4 +1,4 @@
New in spot 2.10.5.dev (not yet released) New in spot 2.10.6.dev (not yet released)
Command-line tools: Command-line tools:
@ -82,10 +82,7 @@ New in spot 2.10.5.dev (not yet released)
averted in the parser by delaying the construction of such n-ary averted in the parser by delaying the construction of such n-ary
nodes until all children are known. nodes until all children are known.
- make_twa_graph() will now preserve state number when copying a New in spot 2.10.6 (2022-05-18)
kripke_graph object. As a consequence, print_dot() and
print_hoa() will now use state numbers matching those of the
kripke_graph (issue #505).
Bugs fixed: Bugs fixed:
@ -94,6 +91,14 @@ New in spot 2.10.5.dev (not yet released)
- Using -Ffile/N to read column N of a CSV file would not reset the - Using -Ffile/N to read column N of a CSV file would not reset the
/N specification for the next file. /N specification for the next file.
- make_twa_graph() will now preserve state number when copying a
kripke_graph object. As a consequence, print_dot() and
print_hoa() will now use state numbers matching those of the
kripke_graph (issue #505).
- Fix several compilation warning introduced by newer versions
of GCC and Clang.
New in spot 2.10.5 (2022-05-03) New in spot 2.10.5 (2022-05-03)
Bugs fixed: Bugs fixed:

2
configure.ac
View file

@ -21,7 +21,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ([2.69]) AC_PREREQ([2.69])
AC_INIT([spot], [2.10.5.dev], [spot@lrde.epita.fr]) AC_INIT([spot], [2.10.6.dev], [spot@lrde.epita.fr])
AC_CONFIG_AUX_DIR([tools]) AC_CONFIG_AUX_DIR([tools])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.11 gnu tar-ustar color-tests parallel-tests]) AM_INIT_AUTOMAKE([1.11 gnu tar-ustar color-tests parallel-tests])

10
doc/org/setup.org
View file

@ -1,11 +1,11 @@
#+OPTIONS: H:2 num:nil toc:t html-postamble:nil ^:nil #+OPTIONS: H:2 num:nil toc:t html-postamble:nil ^:nil
#+EMAIL: spot@lrde.epita.fr #+EMAIL: spot@lrde.epita.fr
#+HTML_LINK_HOME: index.html #+HTML_LINK_HOME: index.html
#+MACRO: SPOTVERSION 2.10.5 #+MACRO: SPOTVERSION 2.10.6
#+MACRO: LASTRELEASE 2.10.5 #+MACRO: LASTRELEASE 2.10.6
#+MACRO: LASTTARBALL [[http://www.lrde.epita.fr/dload/spot/spot-2.10.5.tar.gz][=spot-2.10.5.tar.gz=]] #+MACRO: LASTTARBALL [[http://www.lrde.epita.fr/dload/spot/spot-2.10.6.tar.gz][=spot-2.10.6.tar.gz=]]
#+MACRO: LASTNEWS [[https://gitlab.lrde.epita.fr/spot/spot/blob/spot-2-10-5/NEWS][summary of the changes]] #+MACRO: LASTNEWS [[https://gitlab.lrde.epita.fr/spot/spot/blob/spot-2-10-6/NEWS][summary of the changes]]
#+MACRO: LASTDATE 2022-05-03 #+MACRO: LASTDATE 2022-05-18
#+ATTR_HTML: :id spotlogo #+ATTR_HTML: :id spotlogo
[[file:spot2.svg]] [[file:spot2.svg]]

18
tests/python/kripke.py
View file

@ -76,6 +76,24 @@ State: [!0&!1] 2 "s2"
--END--""" --END--"""
tc.assertEqual(hoa, k.to_str('HOA')) tc.assertEqual(hoa, k.to_str('HOA'))
k.set_state_names(["s0", "s1", "s2"])
hoa = """HOA: v1
States: 3
Start: 1
AP: 2 "p1" "p2"
acc-name: all
Acceptance: 0 t
properties: state-labels explicit-labels state-acc
--BODY--
State: [0&1] 0 "s0"
0
State: [0&!1] 1 "s1"
0 2
State: [!0&!1] 2 "s2"
2 0
--END--"""
tc.assertEqual(hoa, k.to_str('HOA'))
res = [] res = []
for e in k.out(s1): for e in k.out(s1):
res.append((e.src, e.dst)) res.append((e.src, e.dst))