merge_states: include sorting and detection of identical self-loops

* spot/twa/twagraph.cc: Implement it.
* spot/twa/twagraph.hh, NEWS: Document it.
* tests/python/mergedge.py: Test it.
* tests/core/ltlsynt.test, tests/python/games.ipynb: Adjust expectations.
This commit is contained in:
Alexandre Duret-Lutz 2021-05-17 18:30:16 +02:00
parent e12f22f82a
commit 634dd28379
6 changed files with 89 additions and 27 deletions

View file

@ -960,23 +960,23 @@
"[!0] 3 {1}\n",
"[0] 4 {1}\n",
"State: 2\n",
"[0] 4 {1}\n",
"[!0] 5 {1}\n",
"[0] 4 {1}\n",
"State: 3\n",
"[!1] 6 {1}\n",
"[1] 7 {2}\n",
"State: 4\n",
"[t] 8 {2}\n",
"State: 5\n",
"[1] 7 {2}\n",
"[!1] 6 {1}\n",
"[1] 7 {2}\n",
"State: 6\n",
"[t] 3 {1}\n",
"State: 7\n",
"[t] 5 {2}\n",
"State: 8\n",
"[0] 4 {2}\n",
"[!0] 9 {1}\n",
"[0] 4 {2}\n",
"State: 9\n",
"[t] 10 {1}\n",
"State: 10\n",

View file

@ -1,6 +1,6 @@
#!/usr/bin/python3
# -*- mode: python; coding: utf-8 -*-
# Copyright (C) 2020 Laboratoire de Recherche et Développement de
# Copyright (C) 2020, 2021 Laboratoire de Recherche et Développement de
# l'EPITA.
#
# This file is part of Spot, a model checking library.
@ -53,3 +53,33 @@ assert aut.num_edges() == 9
aut.merge_edges()
assert aut.num_edges() == 5
assert spot.is_deterministic(aut)
aut = spot.automaton("""
HOA: v1
States: 3
Start: 0
AP: 1 "a"
acc-name: Buchi
Acceptance: 1 Inf(0)
properties: trans-labels explicit-labels trans-acc complete
--BODY--
State: 0
[!0] 1 {0}
[0] 2 {0}
State: 1
[!0] 1 {0}
[0] 1
State: 2
[!0] 2 {0}
[0] 1
--END--""")
aut.merge_states()
assert aut.num_edges() == 4
assert aut.num_states() == 2
assert spot.is_deterministic(aut)
assert aut.prop_complete()
aut.merge_states()
assert aut.num_edges() == 4
assert aut.num_states() == 2
assert spot.is_deterministic(aut)
assert aut.prop_complete()