twa_graph: swap the two passes of merge_edges()

This improves the determinism in a few cases.

* spot/twa/twagraph.cc (merge_edges): Encapsulate the two
passes into lambdas so that they are very easy to swap.
* spot/twa/twagraph.hh (merge_edges): Adjust documentation.
* tests/python/mergedge.py: Add test case.
* tests/core/alternating.test, tests/python/alternation.ipynb:
Determinism was improved.
* tests/core/parity2.test, tests/core/readsave.test,
tests/core/sbacc.test, tests/python/_product_susp.ipynb,
tests/python/atva16-fig2a.ipynb, tests/python/decompose.ipynb,
tests/python/highlighting.ipynb, tests/python/satmin.ipynb,
tests/python/simstate.py: Adjust expected order of edges.
* NEWS: Mention the change.
This commit is contained in:
Alexandre Duret-Lutz 2021-01-19 20:58:04 +01:00
parent e8e31c2723
commit 2072151499
15 changed files with 1963 additions and 1896 deletions

View file

@ -3667,14 +3667,14 @@
"<!-- Generated by graphviz version 2.43.0 (0)\n",
" -->\n",
"<!-- Pages: 1 -->\n",
"<svg width=\"116pt\" height=\"205pt\"\n",
" viewBox=\"0.00 0.00 115.80 205.00\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n",
"<svg width=\"118pt\" height=\"205pt\"\n",
" viewBox=\"0.00 0.00 117.80 205.00\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n",
"<g id=\"graph0\" class=\"graph\" transform=\"scale(1.0 1.0) rotate(0) translate(4 201)\">\n",
"<polygon fill=\"white\" stroke=\"transparent\" points=\"-4,4 -4,-201 111.8,-201 111.8,4 -4,4\"/>\n",
"<text text-anchor=\"start\" x=\"33.4\" y=\"-182.8\" font-family=\"Lato\" font-size=\"14.00\">Inf(</text>\n",
"<text text-anchor=\"start\" x=\"54.4\" y=\"-182.8\" font-family=\"Lato\" font-size=\"14.00\" fill=\"#1f78b4\">⓿</text>\n",
"<text text-anchor=\"start\" x=\"70.4\" y=\"-182.8\" font-family=\"Lato\" font-size=\"14.00\">)</text>\n",
"<text text-anchor=\"start\" x=\"32.4\" y=\"-168.8\" font-family=\"Lato\" font-size=\"14.00\">[Büchi]</text>\n",
"<polygon fill=\"white\" stroke=\"transparent\" points=\"-4,4 -4,-201 113.8,-201 113.8,4 -4,4\"/>\n",
"<text text-anchor=\"start\" x=\"34.4\" y=\"-182.8\" font-family=\"Lato\" font-size=\"14.00\">Inf(</text>\n",
"<text text-anchor=\"start\" x=\"55.4\" y=\"-182.8\" font-family=\"Lato\" font-size=\"14.00\" fill=\"#1f78b4\">⓿</text>\n",
"<text text-anchor=\"start\" x=\"71.4\" y=\"-182.8\" font-family=\"Lato\" font-size=\"14.00\">)</text>\n",
"<text text-anchor=\"start\" x=\"33.4\" y=\"-168.8\" font-family=\"Lato\" font-size=\"14.00\">[Büchi]</text>\n",
"<!-- I -->\n",
"<!-- 0 -->\n",
"<g id=\"node2\" class=\"node\">\n",
@ -3706,7 +3706,7 @@
"<title>1&#45;&gt;1</title>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M46.39,-21.89C56.3,-22.21 64.8,-20.91 64.8,-18 64.8,-15.82 60.02,-14.54 53.45,-14.17\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"46.39,-14.11 53.41,-11.02 49.89,-14.14 53.39,-14.17 53.39,-14.17 53.39,-14.17 49.89,-14.14 53.36,-17.32 46.39,-14.11 46.39,-14.11\"/>\n",
"<text text-anchor=\"middle\" x=\"69.3\" y=\"-14.3\" font-family=\"Lato\" font-size=\"14.00\">1</text>\n",
"<text text-anchor=\"start\" x=\"64.8\" y=\"-14.3\" font-family=\"Lato\" font-size=\"14.00\">!a</text>\n",
"</g>\n",
"<!-- 1&#45;&gt;1 -->\n",
"<g id=\"edge4\" class=\"edge\">\n",
@ -4296,7 +4296,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.2"
"version": "3.9.1+"
}
},
"nbformat": 4,