add a newer version of the generic emptiness check
As discussed with Jan Strejček. * spot/twa/acc.cc, spot/twa/acc.hh (fin_unit_one_split): New function. (fin_one_extract): Return the simplified acceptance condition as an optimization. * python/spot/impl.i: Bind this new function. * tests/python/acc.py: New file, to test it. * tests/Makefile.am: Add acc.py. * spot/twaalgos/genem.cc, spot/twaalgos/genem.hh: Implement the spot211 variant of the emptiness check. * tests/python/genem.py: Test it. * tests/python/acc_cond.ipynb: Adjust test for fin_one_extract.
This commit is contained in:
Alexandre Duret-Lutz
parent
aca6bd9042
commit
721d5695ec
9 changed files with 308 additions and 30 deletions
65
tests/python/acc.py
Normal file
65
tests/python/acc.py
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
# -*- mode: python; coding: utf-8 -*-
|
||||
# Copyright (C) 2022 Laboratoire de Recherche et Développement
|
||||
# de l'Epita
|
||||
#
|
||||
# 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/>.
|
||||
|
||||
import spot
|
||||
from unittest import TestCase
|
||||
tc = TestCase()
|
||||
|
||||
a = spot.acc_cond('parity min odd 5')
|
||||
tc.assertEqual(str(a.fin_unit_one_split()),
|
||||
'(0, {}, spot.acc_cond(5, "f"))'.format(repr(a)))
|
||||
|
||||
a.set_acceptance('Rabin 3')
|
||||
tc.assertEqual(str(a.fin_unit_one_split()),
|
||||
'(0, spot.acc_cond(5, "Inf(1)"), '
|
||||
'spot.acc_cond(5, "(Fin(2) & Inf(3)) | (Fin(4) & Inf(5))"))')
|
||||
|
||||
a.set_acceptance('(Fin(0)|Inf(3))&(Fin(1)|Inf(4))&(Fin(2)|Inf(5)) |\
|
||||
(Fin(0)|Inf(4))&(Fin(1)|Inf(5))&(Fin(2)|Inf(3)) |\
|
||||
(Fin(0)|Inf(5))&(Fin(1)|Inf(3))&(Fin(2)|Inf(4))')
|
||||
|
||||
tc.maxDiff = None
|
||||
tc.assertEqual(str(a.fin_unit_one_split()),
|
||||
'(0, spot.acc_cond(5, '
|
||||
'"((Fin(1) | Inf(4)) & (Fin(2) | Inf(5))) | '
|
||||
'((Fin(1) | Inf(5)) & (Fin(2) | Inf(3))) | '
|
||||
'((Fin(1) | Inf(3)) & (Fin(2) | Inf(4)))"), '
|
||||
'spot.acc_cond(5, '
|
||||
'"(Inf(3) & (Fin(1) | Inf(4)) & (Fin(2) | Inf(5))) | '
|
||||
'(Inf(4) & (Fin(1) | Inf(5)) & (Fin(2) | Inf(3))) | '
|
||||
'(Inf(5) & (Fin(1) | Inf(3)) & (Fin(2) | Inf(4)))"))')
|
||||
|
||||
a = a.remove([4], True)
|
||||
tc.assertEqual(str(a.fin_unit_one_split()),
|
||||
'(1, spot.acc_cond(5, '
|
||||
'"(Fin(0) | Inf(3)) & (Fin(2) | Inf(5))"), '
|
||||
'spot.acc_cond(5, '
|
||||
'"(Fin(0) & (Fin(1) | Inf(5)) & (Fin(2) | Inf(3))) | '
|
||||
'((Fin(0) | Inf(5)) & (Fin(1) | Inf(3)) & Fin(2))"))')
|
||||
|
||||
def report_missing_exception():
|
||||
raise RuntimeError("missing exception")
|
||||
|
||||
a.set_acceptance("Inf(0)")
|
||||
try:
|
||||
a.fin_unit_one_split()
|
||||
except RuntimeError as e:
|
||||
tc.assertIn('no Fin', str(e))
|
||||
else:
|
||||
report_missing_exception()
|
||||
|
|
@ -1416,7 +1416,7 @@
|
|||
"source": [
|
||||
"`fin_one()` return the number of one color `x` that appears as `Fin(x)` in the formula, or `-1` if the formula is Fin-less.\n",
|
||||
"\n",
|
||||
"The variant `fin_one_extract()` consider the acceptance condition as a disjunction (if the top-level operator is not a disjunction, we just assume the formula is a disjunction with only one disjunct), and return a pair `(x,c)` where `c` is the disjunction of all disjuncts of the original formula where `Fin(x)` appear. Also this function tries to choose an `x` such that one of the disjunct has the form `...&Fin(x)&...` if possible: this is visible in the third example, where 5 is prefered to 2."
|
||||
"The variant `fin_one_extract()` consider the acceptance condition as a disjunction (if the top-level operator is not a disjunction, we just assume the formula is a disjunction with only one disjunct), and return a pair `(x,c)` where `c` is the disjunction of all disjuncts of the original formula where `Fin(x)` used to appear but where `Fin(x)` have been replaced by `true`, and `Inf(x)` by `false`. Also this function tries to choose an `x` such that one of the disjunct has the form `...&Fin(x)&...` if possible: this is visible in the third example, where 5 is prefered to 2."
|
||||
]
|
||||
},
|
||||
{
|
||||
|
|
@ -1430,7 +1430,7 @@
|
|||
"text": [
|
||||
"(4, (Fin(0) | Inf(1)) & (Fin(2) | Inf(3)))\n",
|
||||
"0\n",
|
||||
"(0, spot.acc_cond(4, \"(Fin(0) | Inf(1)) & (Fin(2) | Inf(3))\"))\n"
|
||||
"(0, spot.acc_cond(4, \"Fin(2) | Inf(3)\"))\n"
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
@ -1451,7 +1451,7 @@
|
|||
"text": [
|
||||
"(6, (Fin(0) & Inf(1)) | (Fin(2) & Inf(3)) | (Fin(4) & Inf(5)))\n",
|
||||
"0\n",
|
||||
"(0, spot.acc_cond(6, \"Fin(0) & Inf(1)\"))\n"
|
||||
"(0, spot.acc_cond(6, \"Inf(1)\"))\n"
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
@ -1473,7 +1473,7 @@
|
|||
"text": [
|
||||
"(6, (Inf(0) & (Fin(2) | Inf(3))) | (Inf(4) & Fin(5)) | ((Inf(0)&Inf(5)) & (Fin(0)|Fin(5))))\n",
|
||||
"2\n",
|
||||
"(5, spot.acc_cond(6, \"(Inf(4) & Fin(5)) | ((Inf(0)&Inf(5)) & (Fin(0)|Fin(5)))\"))\n"
|
||||
"(5, spot.acc_cond(6, \"Inf(4)\"))\n"
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
@ -1483,11 +1483,40 @@
|
|||
"print(acc3.fin_one())\n",
|
||||
"print(acc3.fin_one_extract())"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": 58,
|
||||
"metadata": {},
|
||||
"outputs": [
|
||||
{
|
||||
"name": "stdout",
|
||||
"output_type": "stream",
|
||||
"text": [
|
||||
"(8, (Fin(1) & Inf(2)) | (Inf(3)&Inf(4)) | (Inf(5) & (Fin(1)|Fin(7))))\n",
|
||||
"1\n",
|
||||
"(1, spot.acc_cond(8, \"Inf(2) | Inf(5)\"))\n"
|
||||
]
|
||||
}
|
||||
],
|
||||
"source": [
|
||||
"acc4 = spot.acc_cond('Fin(1)&Inf(2)|Inf(3)&Inf(4)|Inf(5)&(Fin(1)|Fin(7))')\n",
|
||||
"print(acc4)\n",
|
||||
"print(acc4.fin_one())\n",
|
||||
"print(acc4.fin_one_extract())"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cell_type": "code",
|
||||
"execution_count": null,
|
||||
"metadata": {},
|
||||
"outputs": [],
|
||||
"source": []
|
||||
}
|
||||
],
|
||||
"metadata": {
|
||||
"kernelspec": {
|
||||
"display_name": "Python 3",
|
||||
"display_name": "Python 3 (ipykernel)",
|
||||
"language": "python",
|
||||
"name": "python3"
|
||||
},
|
||||
|
|
@ -1501,7 +1530,7 @@
|
|||
"name": "python",
|
||||
"nbconvert_exporter": "python",
|
||||
"pygments_lexer": "ipython3",
|
||||
"version": "3.7.3"
|
||||
"version": "3.10.5"
|
||||
}
|
||||
},
|
||||
"nbformat": 4,
|
||||
|
|
|
|||
|
|
@ -305,14 +305,17 @@ def run_bench(automata):
|
|||
res3c = spot.generic_emptiness_check(aut)
|
||||
spot.generic_emptiness_check_select_version("spot210")
|
||||
res3d = spot.generic_emptiness_check(aut)
|
||||
spot.generic_emptiness_check_select_version("spot211")
|
||||
res3e = spot.generic_emptiness_check(aut)
|
||||
spot.generic_emptiness_check_select_version("spot29")
|
||||
res2 = spot.remove_fin(aut).is_empty()
|
||||
res1 = generic_emptiness2(aut)
|
||||
res = (str(res1)[0] + str(res2)[0] + str(res3a)[0]
|
||||
+ str(res3b)[0] + str(res3c)[0] + str(res3d)[0]
|
||||
+ str(res4)[0] + str(res5)[0])
|
||||
+ str(res3e)[0] + str(res4)[0] + str(res5)[0])
|
||||
print(res)
|
||||
tc.assertIn(res, ('TTTTTTTT', 'FFFFFFFF'))
|
||||
if res == 'FFFFFFFF':
|
||||
tc.assertIn(res, ('TTTTTTTTT', 'FFFFFFFFF'))
|
||||
if res == 'FFFFFFFFF':
|
||||
run3 = spot.generic_accepting_run(aut)
|
||||
tc.assertTrue(run3.replay(spot.get_cout()))
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue