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

replace bdd_satoneset(x,y,bddtrue) loops by minterms_of(x,y)

Browse source 
Because the loops iterate in the opposite order, multiple
test cases need to be adjusted.

* spot/taalgos/tgba2ta.cc, spot/twaalgos/alternation.cc,
spot/twaalgos/dualize.cc, spot/twaalgos/ltl2tgba_fm.cc,
spot/twaalgos/simulation.cc, spot/twaalgos/stutter.cc,
spot/twaalgos/toweak.cc: Replace loops based on
bdd_satonest(x,y,bddtrue) by loops based on minterms_of(x,y).
* tests/core/degenscc.test, tests/core/dualize.test,
tests/core/genltl.test, tests/core/readsave.test,
tests/python/alternation.ipynb, tests/python/automata.ipynb,
tests/python/decompose.ipynb, tests/python/decompose_scc.py,
tests/python/dualize.py, tests/python/sccinfo.py,
tests/python/simstate.py, tests/python/testingaut.ipynb,
tests/python/word.ipynb: Adjust expected test cases.  The
only regression is in genltl.test, but the worsened case
should eventually be fixed as discussed in issue #425 anyway.
This commit is contained in:
Alexandre Duret-Lutz 2021-04-14 17:31:45 +02:00
parent d54dca610e
commit 2a38328a5c
20 changed files with 1315 additions and 1432 deletions
Download patch file Download diff file Expand all files Collapse all files

218
tests/python/word.ipynb
View file

@ -31,14 +31,14 @@
"<!-- Generated by graphviz version 2.43.0 (0)\n",
" -->\n",
"<!-- Pages: 1 -->\n",
"<svg width=\"465pt\" height=\"232pt\"\n",
" viewBox=\"0.00 0.00 464.50 232.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 228)\">\n",
"<polygon fill=\"white\" stroke=\"transparent\" points=\"-4,4 -4,-228 460.5,-228 460.5,4 -4,4\"/>\n",
"<text text-anchor=\"start\" x=\"207.25\" y=\"-209.8\" font-family=\"Lato\" font-size=\"14.00\">Inf(</text>\n",
"<text text-anchor=\"start\" x=\"229.25\" y=\"-209.8\" font-family=\"Lato\" font-size=\"14.00\" fill=\"#1f78b4\">⓿</text>\n",
"<text text-anchor=\"start\" x=\"245.25\" y=\"-209.8\" font-family=\"Lato\" font-size=\"14.00\">)</text>\n",
"<text text-anchor=\"start\" x=\"205.25\" y=\"-195.8\" font-family=\"Lato\" font-size=\"14.00\">[Büchi]</text>\n",
"<svg width=\"574pt\" height=\"194pt\"\n",
" viewBox=\"0.00 0.00 574.00 194.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 190)\">\n",
"<polygon fill=\"white\" stroke=\"transparent\" points=\"-4,4 -4,-190 570,-190 570,4 -4,4\"/>\n",
"<text text-anchor=\"start\" x=\"262.5\" y=\"-171.8\" font-family=\"Lato\" font-size=\"14.00\">Inf(</text>\n",
"<text text-anchor=\"start\" x=\"283.5\" y=\"-171.8\" font-family=\"Lato\" font-size=\"14.00\" fill=\"#1f78b4\">⓿</text>\n",
"<text text-anchor=\"start\" x=\"299.5\" y=\"-171.8\" font-family=\"Lato\" font-size=\"14.00\">)</text>\n",
"<text text-anchor=\"start\" x=\"261.5\" y=\"-157.8\" font-family=\"Lato\" font-size=\"14.00\">[Büchi]</text>\n",
"<!-- I -->\n",
"<!-- 0 -->\n",
"<g id=\"node2\" class=\"node\">\n",
@ -68,105 +68,105 @@
"<!-- 2 -->\n",
"<g id=\"node4\" class=\"node\">\n",
"<title>2</title>\n",
"<ellipse fill=\"#ffffaa\" stroke=\"black\" cx=\"218\" cy=\"-109\" rx=\"18\" ry=\"18\"/>\n",
"<text text-anchor=\"middle\" x=\"218\" y=\"-105.3\" font-family=\"Lato\" font-size=\"14.00\">2</text>\n",
"<ellipse fill=\"#ffffaa\" stroke=\"black\" cx=\"222\" cy=\"-99\" rx=\"18\" ry=\"18\"/>\n",
"<text text-anchor=\"middle\" x=\"222\" y=\"-95.3\" font-family=\"Lato\" font-size=\"14.00\">2</text>\n",
"</g>\n",
"<!-- 1&#45;&gt;2 -->\n",
"<g id=\"edge3\" class=\"edge\">\n",
"<title>1&#45;&gt;2</title>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M153.77,-58.91C166.03,-68.62 184.1,-82.94 197.79,-93.78\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"203.35,-98.19 195.91,-96.31 200.61,-96.02 197.87,-93.84 197.87,-93.84 197.87,-93.84 200.61,-96.02 199.82,-91.37 203.35,-98.19 203.35,-98.19\"/>\n",
"<text text-anchor=\"start\" x=\"175\" y=\"-83.8\" font-family=\"Lato\" font-size=\"14.00\">a</text>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M154.86,-57.35C167.53,-65.33 185.9,-76.9 200.06,-85.82\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"206.24,-89.71 198.64,-88.64 203.28,-87.84 200.31,-85.98 200.31,-85.98 200.31,-85.98 203.28,-87.84 201.99,-83.31 206.24,-89.71 206.24,-89.71\"/>\n",
"<text text-anchor=\"start\" x=\"175\" y=\"-79.8\" font-family=\"Lato\" font-size=\"14.00\">!a</text>\n",
"</g>\n",
"<!-- 3 -->\n",
"<g id=\"node5\" class=\"node\">\n",
"<title>3</title>\n",
"<ellipse fill=\"#ffffaa\" stroke=\"black\" cx=\"327\" cy=\"-81\" rx=\"18\" ry=\"18\"/>\n",
"<text text-anchor=\"middle\" x=\"327\" y=\"-77.3\" font-family=\"Lato\" font-size=\"14.00\">3</text>\n",
"<ellipse fill=\"#ffffaa\" stroke=\"black\" cx=\"330\" cy=\"-67\" rx=\"18\" ry=\"18\"/>\n",
"<text text-anchor=\"middle\" x=\"330\" y=\"-63.3\" font-family=\"Lato\" font-size=\"14.00\">3</text>\n",
"</g>\n",
"<!-- 1&#45;&gt;3 -->\n",
"<g id=\"edge4\" class=\"edge\">\n",
"<title>1&#45;&gt;3</title>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M157.27,-50.51C185.39,-54.68 242.77,-63.5 291,-73 294.65,-73.72 298.51,-74.54 302.27,-75.37\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"309.31,-76.97 301.79,-78.49 305.9,-76.19 302.48,-75.42 302.48,-75.42 302.48,-75.42 305.9,-76.19 303.18,-72.35 309.31,-76.97 309.31,-76.97\"/>\n",
"<text text-anchor=\"start\" x=\"212.5\" y=\"-65.8\" font-family=\"Lato\" font-size=\"14.00\">!a</text>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M157,-49.41C176.9,-51.1 210.86,-54.05 240,-57 261.93,-59.22 286.86,-62.05 304.75,-64.13\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"311.95,-64.97 304.63,-67.29 308.47,-64.56 305,-64.16 305,-64.16 305,-64.16 308.47,-64.56 305.36,-61.03 311.95,-64.97 311.95,-64.97\"/>\n",
"<text text-anchor=\"start\" x=\"218.5\" y=\"-60.8\" font-family=\"Lato\" font-size=\"14.00\">a</text>\n",
"</g>\n",
"<!-- 4 -->\n",
"<g id=\"node6\" class=\"node\">\n",
"<title>4</title>\n",
"<ellipse fill=\"#ffffaa\" stroke=\"black\" cx=\"436\" cy=\"-18\" rx=\"18\" ry=\"18\"/>\n",
"<text text-anchor=\"middle\" x=\"436\" y=\"-14.3\" font-family=\"Lato\" font-size=\"14.00\">4</text>\n",
"<ellipse fill=\"#ffffaa\" stroke=\"black\" cx=\"546\" cy=\"-18\" rx=\"18\" ry=\"18\"/>\n",
"<text text-anchor=\"middle\" x=\"546\" y=\"-14.3\" font-family=\"Lato\" font-size=\"14.00\">4</text>\n",
"</g>\n",
"<!-- 1&#45;&gt;4 -->\n",
"<g id=\"edge5\" class=\"edge\">\n",
"<title>1&#45;&gt;4</title>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M157.14,-46.26C207.03,-41.18 352.37,-26.4 410.53,-20.49\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"417.82,-19.75 411.17,-23.59 414.34,-20.1 410.85,-20.46 410.85,-20.46 410.85,-20.46 414.34,-20.1 410.53,-17.32 417.82,-19.75 417.82,-19.75\"/>\n",
"<text text-anchor=\"start\" x=\"267\" y=\"-39.8\" font-family=\"Lato\" font-size=\"14.00\">!a</text>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M152.24,-35.67C167.12,-22.05 193.67,-2 221,-2 221,-2 221,-2 439,-2 467.47,-2 499.76,-7.71 521.14,-12.31\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"528.23,-13.88 520.71,-15.44 524.81,-13.12 521.39,-12.37 521.39,-12.37 521.39,-12.37 524.81,-13.12 522.07,-9.29 528.23,-13.88 528.23,-13.88\"/>\n",
"<text text-anchor=\"start\" x=\"324.5\" y=\"-5.8\" font-family=\"Lato\" font-size=\"14.00\">!a</text>\n",
"</g>\n",
"<!-- 2&#45;&gt;2 -->\n",
"<g id=\"edge6\" class=\"edge\">\n",
"<title>2&#45;&gt;2</title>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M211.27,-126.04C209.89,-135.86 212.14,-145 218,-145 222.4,-145 224.76,-139.86 225.09,-133.14\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"224.73,-126.04 228.23,-132.87 224.91,-129.53 225.08,-133.03 225.08,-133.03 225.08,-133.03 224.91,-129.53 221.93,-133.18 224.73,-126.04 224.73,-126.04\"/>\n",
"<text text-anchor=\"start\" x=\"201\" y=\"-163.8\" font-family=\"Lato\" font-size=\"14.00\">a &amp; b</text>\n",
"<text text-anchor=\"start\" x=\"210\" y=\"-148.8\" font-family=\"Lato\" font-size=\"14.00\" fill=\"#1f78b4\">⓿</text>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M214.97,-115.66C213.41,-125.62 215.75,-135 222,-135 226.69,-135 229.18,-129.73 229.47,-122.89\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"229.03,-115.66 232.6,-122.46 229.24,-119.16 229.46,-122.65 229.46,-122.65 229.46,-122.65 229.24,-119.16 226.31,-122.84 229.03,-115.66 229.03,-115.66\"/>\n",
"<text text-anchor=\"start\" x=\"204\" y=\"-138.8\" font-family=\"Lato\" font-size=\"14.00\">!a &amp; b</text>\n",
"</g>\n",
"<!-- 2&#45;&gt;3 -->\n",
"<g id=\"edge7\" class=\"edge\">\n",
"<title>2&#45;&gt;3</title>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M231.09,-96.52C237.34,-90.95 245.45,-84.98 254,-82 269.38,-76.64 287.75,-76.47 302.09,-77.61\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"309.18,-78.3 301.91,-80.75 305.7,-77.96 302.22,-77.62 302.22,-77.62 302.22,-77.62 305.7,-77.96 302.52,-74.48 309.18,-78.3 309.18,-78.3\"/>\n",
"<text text-anchor=\"start\" x=\"254\" y=\"-85.8\" font-family=\"Lato\" font-size=\"14.00\">!a &amp; b</text>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M239.98,-101.62C254.76,-103.19 276.51,-103.75 294,-97 300.58,-94.46 306.78,-90.11 312.08,-85.51\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"317.45,-80.48 314.49,-87.56 314.89,-82.87 312.34,-85.26 312.34,-85.26 312.34,-85.26 314.89,-82.87 310.18,-82.96 317.45,-80.48 317.45,-80.48\"/>\n",
"<text text-anchor=\"start\" x=\"260\" y=\"-120.8\" font-family=\"Lato\" font-size=\"14.00\">a &amp; b</text>\n",
"<text text-anchor=\"start\" x=\"268\" y=\"-105.8\" font-family=\"Lato\" font-size=\"14.00\" fill=\"#1f78b4\">⓿</text>\n",
"</g>\n",
"<!-- 3&#45;&gt;2 -->\n",
"<g id=\"edge8\" class=\"edge\">\n",
"<title>3&#45;&gt;2</title>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M311.9,-67.8C297.23,-68.92 275.71,-71.59 258,-78 252.96,-79.82 247.84,-82.4 243.14,-85.13\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"237.01,-88.89 241.33,-82.54 240,-87.06 242.98,-85.23 242.98,-85.23 242.98,-85.23 240,-87.06 244.63,-87.91 237.01,-88.89 237.01,-88.89\"/>\n",
"<text text-anchor=\"start\" x=\"258\" y=\"-81.8\" font-family=\"Lato\" font-size=\"14.00\">!a &amp; b</text>\n",
"</g>\n",
"<!-- 3&#45;&gt;3 -->\n",
"<g id=\"edge9\" class=\"edge\">\n",
"<title>3&#45;&gt;3</title>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M320.77,-82.54C318.17,-92.91 321.25,-103 330,-103 336.7,-103 340.08,-97.08 340.12,-89.66\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"339.23,-82.54 343.23,-89.1 339.67,-86.01 340.1,-89.49 340.1,-89.49 340.1,-89.49 339.67,-86.01 336.98,-89.88 339.23,-82.54 339.23,-82.54\"/>\n",
"<text text-anchor=\"start\" x=\"314\" y=\"-121.8\" font-family=\"Lato\" font-size=\"14.00\">a &amp; b</text>\n",
"<text text-anchor=\"start\" x=\"322\" y=\"-106.8\" font-family=\"Lato\" font-size=\"14.00\" fill=\"#1f78b4\">⓿</text>\n",
"</g>\n",
"<!-- 5 -->\n",
"<g id=\"node7\" class=\"node\">\n",
"<title>5</title>\n",
"<ellipse fill=\"#ffffaa\" stroke=\"black\" cx=\"327\" cy=\"-170\" rx=\"18\" ry=\"18\"/>\n",
"<text text-anchor=\"middle\" x=\"327\" y=\"-166.3\" font-family=\"Lato\" font-size=\"14.00\">5</text>\n",
"<ellipse fill=\"#ffffaa\" stroke=\"black\" cx=\"438\" cy=\"-57\" rx=\"18\" ry=\"18\"/>\n",
"<text text-anchor=\"middle\" x=\"438\" y=\"-53.3\" font-family=\"Lato\" font-size=\"14.00\">5</text>\n",
"</g>\n",
"<!-- 2&#45;&gt;5 -->\n",
"<g id=\"edge8\" class=\"edge\">\n",
"<title>2&#45;&gt;5</title>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M231.56,-121.4C237.92,-127.24 245.99,-134 254,-139 269.38,-148.59 288.25,-156.6 302.81,-162.07\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"309.58,-164.54 301.92,-165.1 306.29,-163.34 303.01,-162.14 303.01,-162.14 303.01,-162.14 306.29,-163.34 304.09,-159.18 309.58,-164.54 309.58,-164.54\"/>\n",
"<text text-anchor=\"start\" x=\"254\" y=\"-160.8\" font-family=\"Lato\" font-size=\"14.00\">!a &amp; b</text>\n",
"</g>\n",
"<!-- 3&#45;&gt;2 -->\n",
"<g id=\"edge9\" class=\"edge\">\n",
"<title>3&#45;&gt;2</title>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M310.66,-89.07C304.67,-91.94 297.64,-94.97 291,-97 275.42,-101.77 257.32,-104.77 243.17,-106.58\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"236.17,-107.43 242.74,-103.46 239.64,-107.01 243.12,-106.59 243.12,-106.59 243.12,-106.59 239.64,-107.01 243.49,-109.72 236.17,-107.43 236.17,-107.43\"/>\n",
"<text text-anchor=\"start\" x=\"255.5\" y=\"-123.8\" font-family=\"Lato\" font-size=\"14.00\">a &amp; b</text>\n",
"<text text-anchor=\"start\" x=\"264.5\" y=\"-108.8\" font-family=\"Lato\" font-size=\"14.00\" fill=\"#1f78b4\">⓿</text>\n",
"</g>\n",
"<!-- 3&#45;&gt;3 -->\n",
"<!-- 3&#45;&gt;5 -->\n",
"<g id=\"edge10\" class=\"edge\">\n",
"<title>3&#45;&gt;3</title>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M317.77,-96.54C315.17,-106.91 318.25,-117 327,-117 333.7,-117 337.08,-111.08 337.12,-103.66\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"336.23,-96.54 340.23,-103.1 336.67,-100.01 337.1,-103.49 337.1,-103.49 337.1,-103.49 336.67,-100.01 333.98,-103.88 336.23,-96.54 336.23,-96.54\"/>\n",
"<text text-anchor=\"start\" x=\"308.5\" y=\"-120.8\" font-family=\"Lato\" font-size=\"14.00\">!a &amp; b</text>\n",
"<title>3&#45;&gt;5</title>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M348.03,-65.39C365.57,-63.74 393.06,-61.15 412.84,-59.28\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"420.01,-58.6 413.34,-62.4 416.53,-58.93 413.04,-59.26 413.04,-59.26 413.04,-59.26 416.53,-58.93 412.75,-56.12 420.01,-58.6 420.01,-58.6\"/>\n",
"<text text-anchor=\"start\" x=\"366\" y=\"-66.8\" font-family=\"Lato\" font-size=\"14.00\">!a &amp; b</text>\n",
"</g>\n",
"<!-- 4&#45;&gt;4 -->\n",
"<g id=\"edge11\" class=\"edge\">\n",
"<title>4&#45;&gt;4</title>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M426.77,-33.54C424.17,-43.91 427.25,-54 436,-54 442.7,-54 446.08,-48.08 446.12,-40.66\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"445.23,-33.54 449.23,-40.1 445.67,-37.01 446.1,-40.49 446.1,-40.49 446.1,-40.49 445.67,-37.01 442.98,-40.88 445.23,-33.54 445.23,-33.54\"/>\n",
"<text text-anchor=\"start\" x=\"415.5\" y=\"-72.8\" font-family=\"Lato\" font-size=\"14.00\">!a &amp; !b</text>\n",
"<text text-anchor=\"start\" x=\"428\" y=\"-57.8\" font-family=\"Lato\" font-size=\"14.00\" fill=\"#1f78b4\">⓿</text>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M536.77,-33.54C534.17,-43.91 537.25,-54 546,-54 552.7,-54 556.08,-48.08 556.12,-40.66\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"555.23,-33.54 559.23,-40.1 555.67,-37.01 556.1,-40.49 556.1,-40.49 556.1,-40.49 555.67,-37.01 552.98,-40.88 555.23,-33.54 555.23,-33.54\"/>\n",
"<text text-anchor=\"start\" x=\"526\" y=\"-72.8\" font-family=\"Lato\" font-size=\"14.00\">!a &amp; !b</text>\n",
"<text text-anchor=\"start\" x=\"538\" y=\"-57.8\" font-family=\"Lato\" font-size=\"14.00\" fill=\"#1f78b4\">⓿</text>\n",
"</g>\n",
"<!-- 5&#45;&gt;4 -->\n",
"<g id=\"edge12\" class=\"edge\">\n",
"<title>5&#45;&gt;4</title>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M338.07,-155.7C357.19,-128.54 398.8,-69.43 420.76,-38.22\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"424.88,-32.37 423.43,-39.91 422.87,-35.23 420.85,-38.1 420.85,-38.1 420.85,-38.1 422.87,-35.23 418.28,-36.28 424.88,-32.37 424.88,-32.37\"/>\n",
"<text text-anchor=\"start\" x=\"363\" y=\"-119.8\" font-family=\"Lato\" font-size=\"14.00\">!a &amp; b</text>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M455.1,-51.08C472.92,-44.52 501.79,-33.9 522,-26.46\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"528.75,-23.98 523.27,-29.35 525.46,-25.19 522.18,-26.4 522.18,-26.4 522.18,-26.4 525.46,-25.19 521.09,-23.44 528.75,-23.98 528.75,-23.98\"/>\n",
"<text text-anchor=\"start\" x=\"474\" y=\"-46.8\" font-family=\"Lato\" font-size=\"14.00\">!a &amp; b</text>\n",
"</g>\n",
"</g>\n",
"</svg>\n"
],
"text/plain": [
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f956c0198d0> >"
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f14f57d93c0> >"
]
},
"execution_count": 2,
@ -198,10 +198,12 @@
" 0\n",
" | !a\n",
" 1\n",
" | a\n",
" | !a\n",
"Cycle:\n",
" 2\n",
" | a & b\t{0}\n",
" 3\n",
" | !a & b\n",
"\n"
]
}
@ -253,16 +255,16 @@
"name": "stdout",
"output_type": "stream",
"text": [
"!a; a; cycle{a & b}\n"
"!a; !a; cycle{a & b; !a & b}\n"
]
},
{
"data": {
"text/latex": [
"$\\lnot a; a; \\mathsf{cycle}\\{a \\land b\\}$"
"$\\lnot a; \\lnot a; \\mathsf{cycle}\\{a \\land b; \\lnot a \\land b\\}$"
],
"text/plain": [
"<spot.twa_word; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_word > *' at 0x7f956c019de0> >"
"<spot.twa_word; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_word > *' at 0x7f14f57d9ed0> >"
]
},
"execution_count": 5,
@ -292,14 +294,14 @@
"data": {
"image/svg+xml": [
"\n",
"<svg height=\"112\" width=\"200\" xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\">\n",
"<rect x=\"0\" y=\"0\" width=\"200\" height=\"100\" fill=\"#f4f4f4\"/>\n",
"<svg height=\"112\" width=\"300\" xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\">\n",
"<rect x=\"0\" y=\"0\" width=\"300\" height=\"100\" fill=\"#f4f4f4\"/>\n",
"<line x1=\"100\" y1=\"0\" x2=\"100\" y2=\"100\"\n",
" stroke=\"white\" stroke-width=\"4\"/>\n",
"<line x1=\"150\" y1=\"0\" x2=\"150\" y2=\"100\"\n",
"<line x1=\"200\" y1=\"0\" x2=\"200\" y2=\"100\"\n",
" stroke=\"white\" stroke-width=\"4\"/>\n",
"<line x1=\"0\" y1=\"0\" x2=\"200\" y2=\"0\" stroke=\"white\" stroke-width=\"4\"/><text x=\"3\" y=\"30\" text-anchor=\"start\" font-size=\"20\">a</text><line x1=\"50\" y1=\"0\" x2=\"50\" y2=\"50\" stroke=\"white\" stroke-width=\"1\"/><line x1=\"0\" y1=\"45\" x2=\"50\" y2=\"45\" stroke=\"#ff0000\" stroke-width=\"2\"/><line x1=\"100\" y1=\"0\" x2=\"100\" y2=\"50\" stroke=\"white\" stroke-width=\"1\"/><line x1=\"50\" y1=\"5\" x2=\"50\" y2=\"45\" stroke=\"#ff0000\" stroke-width=\"2\"/><line x1=\"50\" y1=\"5\" x2=\"100\" y2=\"5\" stroke=\"#ff0000\" stroke-width=\"2\"/><line x1=\"150\" y1=\"0\" x2=\"150\" y2=\"50\" stroke=\"white\" stroke-width=\"1\"/><line x1=\"100\" y1=\"5\" x2=\"150\" y2=\"5\" stroke=\"#ff0000\" stroke-width=\"2\"/><line x1=\"200\" y1=\"0\" x2=\"200\" y2=\"50\" stroke=\"white\" stroke-width=\"1\"/><line x1=\"150\" y1=\"5\" x2=\"200\" y2=\"5\" stroke=\"#ff0000\" stroke-width=\"2\"/><line x1=\"0\" y1=\"50\" x2=\"200\" y2=\"50\" stroke=\"white\" stroke-width=\"4\"/><text x=\"3\" y=\"80\" text-anchor=\"start\" font-size=\"20\">b</text><line x1=\"50\" y1=\"50\" x2=\"50\" y2=\"100\" stroke=\"white\" stroke-width=\"1\"/><line x1=\"100\" y1=\"50\" x2=\"100\" y2=\"100\" stroke=\"white\" stroke-width=\"1\"/><line x1=\"150\" y1=\"50\" x2=\"150\" y2=\"100\" stroke=\"white\" stroke-width=\"1\"/><line x1=\"100\" y1=\"55\" x2=\"150\" y2=\"55\" stroke=\"#ff0000\" stroke-width=\"2\"/><line x1=\"200\" y1=\"50\" x2=\"200\" y2=\"100\" stroke=\"white\" stroke-width=\"1\"/><line x1=\"150\" y1=\"55\" x2=\"200\" y2=\"55\" stroke=\"#ff0000\" stroke-width=\"2\"/><text x=\"0\" y=\"110\" text-anchor=\"start\" font-size=\"10\">prefix</text><text x=\"100\" y=\"110\" text-anchor=\"start\" font-size=\"10\">cycle</text>\n",
"<text x=\"150\" y=\"110\" text-anchor=\"start\" font-size=\"10\">cycle</text></svg>"
"<line x1=\"0\" y1=\"0\" x2=\"300\" y2=\"0\" stroke=\"white\" stroke-width=\"4\"/><text x=\"3\" y=\"30\" text-anchor=\"start\" font-size=\"20\">a</text><line x1=\"50\" y1=\"0\" x2=\"50\" y2=\"50\" stroke=\"white\" stroke-width=\"1\"/><line x1=\"0\" y1=\"45\" x2=\"50\" y2=\"45\" stroke=\"#ff0000\" stroke-width=\"2\"/><line x1=\"100\" y1=\"0\" x2=\"100\" y2=\"50\" stroke=\"white\" stroke-width=\"1\"/><line x1=\"50\" y1=\"45\" x2=\"100\" y2=\"45\" stroke=\"#ff0000\" stroke-width=\"2\"/><line x1=\"150\" y1=\"0\" x2=\"150\" y2=\"50\" stroke=\"white\" stroke-width=\"1\"/><line x1=\"100\" y1=\"5\" x2=\"100\" y2=\"45\" stroke=\"#ff0000\" stroke-width=\"2\"/><line x1=\"100\" y1=\"5\" x2=\"150\" y2=\"5\" stroke=\"#ff0000\" stroke-width=\"2\"/><line x1=\"200\" y1=\"0\" x2=\"200\" y2=\"50\" stroke=\"white\" stroke-width=\"1\"/><line x1=\"150\" y1=\"5\" x2=\"150\" y2=\"45\" stroke=\"#ff0000\" stroke-width=\"2\"/><line x1=\"150\" y1=\"45\" x2=\"200\" y2=\"45\" stroke=\"#ff0000\" stroke-width=\"2\"/><line x1=\"250\" y1=\"0\" x2=\"250\" y2=\"50\" stroke=\"white\" stroke-width=\"1\"/><line x1=\"200\" y1=\"5\" x2=\"200\" y2=\"45\" stroke=\"#ff0000\" stroke-width=\"2\"/><line x1=\"200\" y1=\"5\" x2=\"250\" y2=\"5\" stroke=\"#ff0000\" stroke-width=\"2\"/><line x1=\"300\" y1=\"0\" x2=\"300\" y2=\"50\" stroke=\"white\" stroke-width=\"1\"/><line x1=\"250\" y1=\"5\" x2=\"250\" y2=\"45\" stroke=\"#ff0000\" stroke-width=\"2\"/><line x1=\"250\" y1=\"45\" x2=\"300\" y2=\"45\" stroke=\"#ff0000\" stroke-width=\"2\"/><line x1=\"0\" y1=\"50\" x2=\"300\" y2=\"50\" stroke=\"white\" stroke-width=\"4\"/><text x=\"3\" y=\"80\" text-anchor=\"start\" font-size=\"20\">b</text><line x1=\"50\" y1=\"50\" x2=\"50\" y2=\"100\" stroke=\"white\" stroke-width=\"1\"/><line x1=\"100\" y1=\"50\" x2=\"100\" y2=\"100\" stroke=\"white\" stroke-width=\"1\"/><line x1=\"150\" y1=\"50\" x2=\"150\" y2=\"100\" stroke=\"white\" stroke-width=\"1\"/><line x1=\"100\" y1=\"55\" x2=\"150\" y2=\"55\" stroke=\"#ff0000\" stroke-width=\"2\"/><line x1=\"200\" y1=\"50\" x2=\"200\" y2=\"100\" stroke=\"white\" stroke-width=\"1\"/><line x1=\"150\" y1=\"55\" x2=\"200\" y2=\"55\" stroke=\"#ff0000\" stroke-width=\"2\"/><line x1=\"250\" y1=\"50\" x2=\"250\" y2=\"100\" stroke=\"white\" stroke-width=\"1\"/><line x1=\"200\" y1=\"55\" x2=\"250\" y2=\"55\" stroke=\"#ff0000\" stroke-width=\"2\"/><line x1=\"300\" y1=\"50\" x2=\"300\" y2=\"100\" stroke=\"white\" stroke-width=\"1\"/><line x1=\"250\" y1=\"55\" x2=\"300\" y2=\"55\" stroke=\"#ff0000\" stroke-width=\"2\"/><text x=\"0\" y=\"110\" text-anchor=\"start\" font-size=\"10\">prefix</text><text x=\"100\" y=\"110\" text-anchor=\"start\" font-size=\"10\">cycle</text>\n",
"<text x=\"200\" y=\"110\" text-anchor=\"start\" font-size=\"10\">cycle</text></svg>"
],
"text/plain": [
"<spot.jupyter.SVG object>"
@ -331,22 +333,24 @@
"output_type": "stream",
"text": [
"!a\n",
"a\n",
"a & b\n"
"!a\n",
"a & b\n",
"!a & b\n"
]
}
],
"source": [
"print(spot.bdd_format_formula(aut.get_dict(), word.prefix[0]))\n",
"print(spot.bdd_format_formula(aut.get_dict(), word.prefix[1]))\n",
"print(spot.bdd_format_formula(aut.get_dict(), word.cycle[0]))"
"print(spot.bdd_format_formula(aut.get_dict(), word.cycle[0]))\n",
"print(spot.bdd_format_formula(aut.get_dict(), word.cycle[1]))"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"Calling `simplifify()` will produce a shorter word that is compatible with the original word. For instance in the above word, the initial `a` is compatible with both `a & b` and `a & !b`. The word obtained by restricting `a` to `a & b` is therefore still accepted, allowing us to remove the prefix."
"Calling `simplifify()` will produce a shorter word that is compatible with the original word. For instance in the above word, the second `a` is compatible with `!a & b`, so the prefix can be shortened by rotating the cycle."
]
},
{
@ -358,7 +362,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"!a; cycle{a & b}\n"
"!a; cycle{!a & b; a & b}\n"
]
}
],
@ -382,10 +386,10 @@
{
"data": {
"text/latex": [
"$\\lnot a; \\mathsf{cycle}\\{a \\land b\\}$"
"$\\lnot a; \\mathsf{cycle}\\{\\lnot a \\land b; a \\land b\\}$"
],
"text/plain": [
"<spot.twa_word; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_word > *' at 0x7f956c0388a0> >"
"<spot.twa_word; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_word > *' at 0x7f14f57d9660> >"
]
},
"execution_count": 9,
@ -436,7 +440,7 @@
"$a; a \\land b; \\mathsf{cycle}\\{\\lnot a \\land \\lnot b; \\lnot a \\land b\\}$"
],
"text/plain": [
"<spot.twa_word; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_word > *' at 0x7f956c038b70> >"
"<spot.twa_word; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_word > *' at 0x7f14f5799ea0> >"
]
},
"execution_count": 11,
@ -501,76 +505,76 @@
"<!-- Generated by graphviz version 2.43.0 (0)\n",
" -->\n",
"<!-- Pages: 1 -->\n",
"<svg width=\"380pt\" height=\"86pt\"\n",
" viewBox=\"0.00 0.00 380.00 86.36\" 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 82.36)\">\n",
"<polygon fill=\"white\" stroke=\"transparent\" points=\"-4,4 -4,-82.36 376,-82.36 376,4 -4,4\"/>\n",
"<text text-anchor=\"start\" x=\"183\" y=\"-63.16\" font-family=\"Lato\" font-size=\"14.00\">t</text>\n",
"<text text-anchor=\"start\" x=\"175\" y=\"-48.16\" font-family=\"Lato\" font-size=\"14.00\">[all]</text>\n",
"<svg width=\"377pt\" height=\"86pt\"\n",
" viewBox=\"0.00 0.00 377.00 86.28\" 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 82.28)\">\n",
"<polygon fill=\"white\" stroke=\"transparent\" points=\"-4,4 -4,-82.28 373,-82.28 373,4 -4,4\"/>\n",
"<text text-anchor=\"start\" x=\"181.5\" y=\"-63.08\" font-family=\"Lato\" font-size=\"14.00\">t</text>\n",
"<text text-anchor=\"start\" x=\"173.5\" y=\"-48.08\" font-family=\"Lato\" font-size=\"14.00\">[all]</text>\n",
"<!-- I -->\n",
"<!-- 0 -->\n",
"<g id=\"node2\" class=\"node\">\n",
"<title>0</title>\n",
"<ellipse fill=\"#ffffaa\" stroke=\"black\" cx=\"56\" cy=\"-22.36\" rx=\"18\" ry=\"18\"/>\n",
"<text text-anchor=\"middle\" x=\"56\" y=\"-18.66\" font-family=\"Lato\" font-size=\"14.00\">0</text>\n",
"<ellipse fill=\"#ffffaa\" stroke=\"black\" cx=\"56\" cy=\"-22.28\" rx=\"18\" ry=\"18\"/>\n",
"<text text-anchor=\"middle\" x=\"56\" y=\"-18.58\" font-family=\"Lato\" font-size=\"14.00\">0</text>\n",
"</g>\n",
"<!-- I&#45;&gt;0 -->\n",
"<g id=\"edge1\" class=\"edge\">\n",
"<title>I&#45;&gt;0</title>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M1.15,-22.36C2.79,-22.36 17.15,-22.36 30.63,-22.36\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"37.94,-22.36 30.94,-25.51 34.44,-22.36 30.94,-22.36 30.94,-22.36 30.94,-22.36 34.44,-22.36 30.94,-19.21 37.94,-22.36 37.94,-22.36\"/>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M1.15,-22.28C2.79,-22.28 17.15,-22.28 30.63,-22.28\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"37.94,-22.28 30.94,-25.43 34.44,-22.28 30.94,-22.28 30.94,-22.28 30.94,-22.28 34.44,-22.28 30.94,-19.13 37.94,-22.28 37.94,-22.28\"/>\n",
"</g>\n",
"<!-- 1 -->\n",
"<g id=\"node3\" class=\"node\">\n",
"<title>1</title>\n",
"<ellipse fill=\"#ffffaa\" stroke=\"black\" cx=\"135\" cy=\"-22.36\" rx=\"18\" ry=\"18\"/>\n",
"<text text-anchor=\"middle\" x=\"135\" y=\"-18.66\" font-family=\"Lato\" font-size=\"14.00\">1</text>\n",
"<ellipse fill=\"#ffffaa\" stroke=\"black\" cx=\"135\" cy=\"-22.28\" rx=\"18\" ry=\"18\"/>\n",
"<text text-anchor=\"middle\" x=\"135\" y=\"-18.58\" font-family=\"Lato\" font-size=\"14.00\">1</text>\n",
"</g>\n",
"<!-- 0&#45;&gt;1 -->\n",
"<g id=\"edge2\" class=\"edge\">\n",
"<title>0&#45;&gt;1</title>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M74.09,-22.36C84.56,-22.36 98.12,-22.36 109.69,-22.36\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"116.96,-22.36 109.96,-25.51 113.46,-22.36 109.96,-22.36 109.96,-22.36 109.96,-22.36 113.46,-22.36 109.96,-19.21 116.96,-22.36 116.96,-22.36\"/>\n",
"<text text-anchor=\"start\" x=\"92\" y=\"-26.16\" font-family=\"Lato\" font-size=\"14.00\">a</text>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M74.09,-22.28C84.56,-22.28 98.12,-22.28 109.69,-22.28\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"116.96,-22.28 109.96,-25.43 113.46,-22.28 109.96,-22.28 109.96,-22.28 109.96,-22.28 113.46,-22.28 109.96,-19.13 116.96,-22.28 116.96,-22.28\"/>\n",
"<text text-anchor=\"start\" x=\"92\" y=\"-26.08\" font-family=\"Lato\" font-size=\"14.00\">a</text>\n",
"</g>\n",
"<!-- 2 -->\n",
"<g id=\"node4\" class=\"node\">\n",
"<title>2</title>\n",
"<ellipse fill=\"#ffffaa\" stroke=\"black\" cx=\"241\" cy=\"-22.36\" rx=\"18\" ry=\"18\"/>\n",
"<text text-anchor=\"middle\" x=\"241\" y=\"-18.66\" font-family=\"Lato\" font-size=\"14.00\">2</text>\n",
"<ellipse fill=\"#ffffaa\" stroke=\"black\" cx=\"239\" cy=\"-22.28\" rx=\"18\" ry=\"18\"/>\n",
"<text text-anchor=\"middle\" x=\"239\" y=\"-18.58\" font-family=\"Lato\" font-size=\"14.00\">2</text>\n",
"</g>\n",
"<!-- 1&#45;&gt;2 -->\n",
"<g id=\"edge3\" class=\"edge\">\n",
"<title>1&#45;&gt;2</title>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M153.17,-22.36C170.18,-22.36 196.4,-22.36 215.57,-22.36\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"222.8,-22.36 215.8,-25.51 219.3,-22.36 215.8,-22.36 215.8,-22.36 215.8,-22.36 219.3,-22.36 215.8,-19.21 222.8,-22.36 222.8,-22.36\"/>\n",
"<text text-anchor=\"start\" x=\"171\" y=\"-26.16\" font-family=\"Lato\" font-size=\"14.00\">a &amp; b</text>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M153.3,-22.28C169.96,-22.28 195.3,-22.28 213.93,-22.28\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"220.95,-22.28 213.95,-25.43 217.45,-22.28 213.95,-22.28 213.95,-22.28 213.95,-22.28 217.45,-22.28 213.95,-19.13 220.95,-22.28 220.95,-22.28\"/>\n",
"<text text-anchor=\"start\" x=\"171\" y=\"-26.08\" font-family=\"Lato\" font-size=\"14.00\">a &amp; b</text>\n",
"</g>\n",
"<!-- 3 -->\n",
"<g id=\"node5\" class=\"node\">\n",
"<title>3</title>\n",
"<ellipse fill=\"#ffffaa\" stroke=\"black\" cx=\"354\" cy=\"-22.36\" rx=\"18\" ry=\"18\"/>\n",
"<text text-anchor=\"middle\" x=\"354\" y=\"-18.66\" font-family=\"Lato\" font-size=\"14.00\">3</text>\n",
"<ellipse fill=\"#ffffaa\" stroke=\"black\" cx=\"351\" cy=\"-22.28\" rx=\"18\" ry=\"18\"/>\n",
"<text text-anchor=\"middle\" x=\"351\" y=\"-18.58\" font-family=\"Lato\" font-size=\"14.00\">3</text>\n",
"</g>\n",
"<!-- 2&#45;&gt;3 -->\n",
"<g id=\"edge4\" class=\"edge\">\n",
"<title>2&#45;&gt;3</title>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M259.34,-22.36C278,-22.36 307.8,-22.36 328.76,-22.36\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"335.78,-22.36 328.78,-25.51 332.28,-22.36 328.78,-22.36 328.78,-22.36 328.78,-22.36 332.28,-22.36 328.78,-19.21 335.78,-22.36 335.78,-22.36\"/>\n",
"<text text-anchor=\"start\" x=\"277\" y=\"-26.16\" font-family=\"Lato\" font-size=\"14.00\">!a &amp; !b</text>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M257.19,-22.28C275.59,-22.28 304.95,-22.28 325.71,-22.28\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"332.93,-22.28 325.93,-25.43 329.43,-22.28 325.93,-22.28 325.93,-22.28 325.93,-22.28 329.43,-22.28 325.93,-19.13 332.93,-22.28 332.93,-22.28\"/>\n",
"<text text-anchor=\"start\" x=\"275\" y=\"-26.08\" font-family=\"Lato\" font-size=\"14.00\">!a &amp; !b</text>\n",
"</g>\n",
"<!-- 3&#45;&gt;2 -->\n",
"<g id=\"edge5\" class=\"edge\">\n",
"<title>3&#45;&gt;2</title>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M338.69,-12.5C332.6,-8.87 325.24,-5.2 318,-3.36 300.34,1.12 294.66,1.12 277,-3.36 272.14,-4.6 267.22,-6.66 262.67,-8.98\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"256.31,-12.5 260.91,-6.35 259.37,-10.8 262.44,-9.11 262.44,-9.11 262.44,-9.11 259.37,-10.8 263.96,-11.86 256.31,-12.5 256.31,-12.5\"/>\n",
"<text text-anchor=\"start\" x=\"279\" y=\"-7.16\" font-family=\"Lato\" font-size=\"14.00\">!a &amp; b</text>\n",
"<path fill=\"none\" stroke=\"black\" d=\"M335.69,-12.42C329.6,-8.79 322.24,-5.12 315,-3.28 297.77,1.09 292.23,1.09 275,-3.28 270.14,-4.52 265.22,-6.58 260.67,-8.9\"/>\n",
"<polygon fill=\"black\" stroke=\"black\" points=\"254.31,-12.42 258.91,-6.27 257.37,-10.72 260.44,-9.03 260.44,-9.03 260.44,-9.03 257.37,-10.72 261.96,-11.78 254.31,-12.42 254.31,-12.42\"/>\n",
"<text text-anchor=\"start\" x=\"277\" y=\"-7.08\" font-family=\"Lato\" font-size=\"14.00\">!a &amp; b</text>\n",
"</g>\n",
"</g>\n",
"</svg>\n"
],
"text/plain": [
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f956c0388d0> >"
"<spot.twa_graph; proxy of <Swig Object of type 'std::shared_ptr< spot::twa_graph > *' at 0x7f14f5799ed0> >"
]
},
"execution_count": 13,
@ -599,7 +603,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.5"
"version": "3.9.2"
}
},
"nbformat": 4,