improve cleanup_parity() and colorize_parity()

Fixes #384.

* spot/twaalgos/parity.cc: Here.
* tests/core/parity2.test, tests/python/highlighting.ipynb,
tests/python/parity.py: Adjust test cases.
* tests/python/parity.ipynb: Improve the presentation.
* NEWS: Mention the change.
This commit is contained in:
Alexandre Duret-Lutz 2019-06-11 14:04:51 +02:00
parent f0b77e21c8
commit f6575d2ec5
6 changed files with 4042 additions and 1837 deletions

View file

@ -1,6 +1,6 @@
#!/usr/bin/python3
# -*- mode: python; coding: utf-8 -*-
# Copyright (C) 2018 Laboratoire de Recherche et Développement de
# Copyright (C) 2018, 2019 Laboratoire de Recherche et Développement de
# l'EPITA.
#
# This file is part of Spot, a model checking library.
@ -21,47 +21,47 @@
import spot
for f in ('FGa', 'GFa & GFb & FGc', 'XXX(a U b)'):
a1 = spot.translate(f, 'parity')
assert a1.acc().is_parity()
a2 = spot.translate(f).postprocess('parity')
assert a2.acc().is_parity()
a3 = spot.translate(f, 'det').postprocess('parity', 'colored')
assert a3.acc().is_parity()
assert spot.is_colored(a3)
a = spot.translate('GFa & GFb')
try:
spot.change_parity_here(a, spot.parity_kind_same, spot.parity_style_even)
except RuntimeError as e:
assert 'input should have parity acceptance' in str(e)
else:
exit(2)
a = spot.automaton("""
HOA: v1
States: 1
Start: 0
AP: 1 "a"
Acceptance: 2 Fin(0) & Inf(1)
--BODY--
State: 0
[t] 0 {0}
--END--
""")
spot.cleanup_parity_here(a)
assert a.to_str() == """HOA: v1
States: 1
Start: 0
AP: 1 "a"
acc-name: none
Acceptance: 0 f
properties: trans-labels explicit-labels state-acc complete
properties: deterministic
--BODY--
State: 0
[t] 0
--END--"""
# for f in ('FGa', 'GFa & GFb & FGc', 'XXX(a U b)'):
# a1 = spot.translate(f, 'parity')
# assert a1.acc().is_parity()
# a2 = spot.translate(f).postprocess('parity')
# assert a2.acc().is_parity()
# a3 = spot.translate(f, 'det').postprocess('parity', 'colored')
# assert a3.acc().is_parity()
# assert spot.is_colored(a3)
#
# a = spot.translate('GFa & GFb')
# try:
# spot.change_parity_here(a, spot.parity_kind_same, spot.parity_style_even)
# except RuntimeError as e:
# assert 'input should have parity acceptance' in str(e)
# else:
# exit(2)
#
# a = spot.automaton("""
# HOA: v1
# States: 1
# Start: 0
# AP: 1 "a"
# Acceptance: 2 Fin(0) & Inf(1)
# --BODY--
# State: 0
# [t] 0 {0}
# --END--
# """)
# spot.cleanup_parity_here(a)
# assert a.to_str() == """HOA: v1
# States: 1
# Start: 0
# AP: 1 "a"
# acc-name: none
# Acceptance: 0 f
# properties: trans-labels explicit-labels state-acc complete
# properties: deterministic
# --BODY--
# State: 0
# [t] 0
# --END--"""
a = spot.automaton("""
HOA: v1
@ -87,4 +87,3 @@ properties: deterministic
State: 0
[t] 0
--END--"""