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

add a newer version of the generic emptiness check

Browse source 
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 2022-05-25 17:02:38 +02:00
parent aca6bd9042
commit 721d5695ec
9 changed files with 308 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

41
tests/python/acc_cond.ipynb
View file

@ -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,