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
parent
f0b77e21c8
commit
f6575d2ec5
6 changed files with 4042 additions and 1837 deletions
|
|
@ -240,7 +240,7 @@
|
|||
"</svg>\n"
|
||||
],
|
||||
"text/plain": [
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f55b80ee2a0> >"
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f52302b76f0> >"
|
||||
]
|
||||
},
|
||||
"execution_count": 4,
|
||||
|
|
@ -352,7 +352,7 @@
|
|||
"</svg>\n"
|
||||
],
|
||||
"text/plain": [
|
||||
"<spot.twa; proxy of <Swig Object of type 'std::shared_ptr< spot::twa > *' at 0x7f55b8012060> >"
|
||||
"<spot.twa; proxy of <Swig Object of type 'std::shared_ptr< spot::twa > *' at 0x7f523026d2d0> >"
|
||||
]
|
||||
},
|
||||
"execution_count": 5,
|
||||
|
|
@ -462,7 +462,7 @@
|
|||
"</svg>\n"
|
||||
],
|
||||
"text/plain": [
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f55b80ee2a0> >"
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f52302b76f0> >"
|
||||
]
|
||||
},
|
||||
"execution_count": 6,
|
||||
|
|
@ -695,7 +695,7 @@
|
|||
"</svg>\n"
|
||||
],
|
||||
"text/plain": [
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f55b8012840> >"
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f523026d540> >"
|
||||
]
|
||||
},
|
||||
"execution_count": 8,
|
||||
|
|
@ -890,7 +890,7 @@
|
|||
"</svg>\n"
|
||||
],
|
||||
"text/plain": [
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f55b8012840> >"
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f523026d540> >"
|
||||
]
|
||||
},
|
||||
"execution_count": 11,
|
||||
|
|
@ -1228,7 +1228,7 @@
|
|||
"</svg>\n"
|
||||
],
|
||||
"text/plain": [
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f55b802f5d0> >"
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f523026dc30> >"
|
||||
]
|
||||
},
|
||||
"metadata": {},
|
||||
|
|
@ -1489,7 +1489,7 @@
|
|||
"</svg>\n"
|
||||
],
|
||||
"text/plain": [
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f55b802f5d0> >"
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f523026dab0> >"
|
||||
]
|
||||
},
|
||||
"metadata": {},
|
||||
|
|
@ -1672,7 +1672,7 @@
|
|||
"</svg>\n"
|
||||
],
|
||||
"text/plain": [
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f55b802f630> >"
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f523026d720> >"
|
||||
]
|
||||
},
|
||||
"metadata": {},
|
||||
|
|
@ -1789,7 +1789,7 @@
|
|||
"</svg>\n"
|
||||
],
|
||||
"text/plain": [
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f55b802f720> >"
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f523026df60> >"
|
||||
]
|
||||
},
|
||||
"metadata": {},
|
||||
|
|
@ -1844,7 +1844,7 @@
|
|||
"</svg>\n"
|
||||
],
|
||||
"text/plain": [
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f55b802f3f0> >"
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f523026de10> >"
|
||||
]
|
||||
},
|
||||
"metadata": {},
|
||||
|
|
@ -1938,7 +1938,7 @@
|
|||
"</svg>\n"
|
||||
],
|
||||
"text/plain": [
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f55b8089e40> >"
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f523026d720> >"
|
||||
]
|
||||
},
|
||||
"execution_count": 14,
|
||||
|
|
@ -2067,7 +2067,7 @@
|
|||
"</svg>\n"
|
||||
],
|
||||
"text/plain": [
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f55b8089e40> >"
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f523026d720> >"
|
||||
]
|
||||
},
|
||||
"metadata": {},
|
||||
|
|
@ -2132,7 +2132,7 @@
|
|||
"</svg>\n"
|
||||
],
|
||||
"text/plain": [
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f55b802f720> >"
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f523026df60> >"
|
||||
]
|
||||
},
|
||||
"metadata": {},
|
||||
|
|
@ -2187,7 +2187,7 @@
|
|||
"</svg>\n"
|
||||
],
|
||||
"text/plain": [
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f55b802f3f0> >"
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f523026de10> >"
|
||||
]
|
||||
},
|
||||
"metadata": {},
|
||||
|
|
@ -2418,7 +2418,7 @@
|
|||
"</svg>\n"
|
||||
],
|
||||
"text/plain": [
|
||||
"<spot.impl.twa_product; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_product > *' at 0x7f55b802f360> >"
|
||||
"<spot.impl.twa_product; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_product > *' at 0x7f52302b77b0> >"
|
||||
]
|
||||
},
|
||||
"metadata": {},
|
||||
|
|
@ -2503,7 +2503,7 @@
|
|||
"</svg>\n"
|
||||
],
|
||||
"text/plain": [
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f55b802f2a0> >"
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f5230302450> >"
|
||||
]
|
||||
},
|
||||
"metadata": {},
|
||||
|
|
@ -2600,7 +2600,7 @@
|
|||
"</svg>\n"
|
||||
],
|
||||
"text/plain": [
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f55b802f0f0> >"
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f523026d9c0> >"
|
||||
]
|
||||
},
|
||||
"metadata": {},
|
||||
|
|
@ -2769,7 +2769,7 @@
|
|||
"</svg>\n"
|
||||
],
|
||||
"text/plain": [
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f55b802f960> >"
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f523027d4b0> >"
|
||||
]
|
||||
},
|
||||
"execution_count": 19,
|
||||
|
|
@ -2937,7 +2937,7 @@
|
|||
"</svg>\n"
|
||||
],
|
||||
"text/plain": [
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f55b802f960> >"
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f523027d4b0> >"
|
||||
]
|
||||
},
|
||||
"execution_count": 20,
|
||||
|
|
@ -3100,7 +3100,7 @@
|
|||
"</svg>\n"
|
||||
],
|
||||
"text/plain": [
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f55b802f960> >"
|
||||
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f523027d4b0> >"
|
||||
]
|
||||
},
|
||||
"metadata": {},
|
||||
|
|
@ -3575,7 +3575,7 @@
|
|||
"name": "python",
|
||||
"nbconvert_exporter": "python",
|
||||
"pygments_lexer": "ipython3",
|
||||
"version": "3.7.2+"
|
||||
"version": "3.6.4"
|
||||
}
|
||||
},
|
||||
"nbformat": 4,
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -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--"""
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue