autfilt: Better display of cluster when universal edge loops in it
Fixes #208 * NEWS: Informations about the modifications * spot/twaalgos/dot.cc (print): Gestion of cluster for universal transitions * tests/core/alternating.test: tests added * tests/core/neverclaimread.test: tests changed for new dot format * tests/core/readsave.test: tests changed * tests/core/sccdot.test: tests changed * tests/python/_altscc.ipynb: tests changed * tests/python/decompose.ipynb: tests changed
This commit is contained in:
Arthur Remaud
Arthur Remaud
parent
34859568cd
commit
f7bbfd2812
8 changed files with 1099 additions and 971 deletions
|
|
@ -69,37 +69,49 @@ digraph G {
|
|||
color=green
|
||||
label=""
|
||||
2 [label="G(a)"]
|
||||
2 -> 2 [label="a"]
|
||||
}
|
||||
subgraph cluster_1 {
|
||||
color=red
|
||||
label=""
|
||||
1 [label="FG(a)\n⓿"]
|
||||
1 -> 2 [label="a"]
|
||||
1 -> 1 [label="1"]
|
||||
}
|
||||
subgraph cluster_2 {
|
||||
color=green
|
||||
label=""
|
||||
6 [label="t"]
|
||||
6 -> 6 [label="1"]
|
||||
}
|
||||
subgraph cluster_3 {
|
||||
color=red
|
||||
label=""
|
||||
4 [label="F(b)\n⓿"]
|
||||
4 -> 6 [label="b"]
|
||||
4 -> 4 [label="!b"]
|
||||
}
|
||||
subgraph cluster_4 {
|
||||
color=green
|
||||
label=""
|
||||
3 [label="GF(b)"]
|
||||
3 -> 3 [label="b"]
|
||||
3 -> -8.4 [label="!b", style=bold, color="#FAA43A", arrowhead=onormal]
|
||||
-8.4 [label=<>,shape=point]
|
||||
-8.4 -> 3 [style=bold, color="#FAA43A"]
|
||||
-8.4 -> 4 [style=bold, color="#FAA43A"]
|
||||
}
|
||||
subgraph cluster_5 {
|
||||
color=red
|
||||
label=""
|
||||
5 [label="((a) U (b))\n⓿"]
|
||||
5 -> 6 [label="b"]
|
||||
5 -> 5 [label="a & !b"]
|
||||
}
|
||||
subgraph cluster_6 {
|
||||
color=black
|
||||
label=""
|
||||
0 [label="((((a) U (b)) && GF(b)) && FG(a))"]
|
||||
}
|
||||
0 -> -1 [label="b", arrowhead=onormal]
|
||||
-1 [label=<>,shape=point]
|
||||
-1 -> 1
|
||||
|
|
@ -109,19 +121,7 @@ digraph G {
|
|||
-4 -> 1 [style=bold, color="#F15854"]
|
||||
-4 -> 3 [style=bold, color="#F15854"]
|
||||
-4 -> 5 [style=bold, color="#F15854"]
|
||||
1 -> 2 [label="a"]
|
||||
1 -> 1 [label="1"]
|
||||
2 -> 2 [label="a"]
|
||||
3 -> 3 [label="b"]
|
||||
3 -> -8 [label="!b", style=bold, color="#FAA43A", arrowhead=onormal]
|
||||
-8 [label=<>,shape=point]
|
||||
-8 -> 3 [style=bold, color="#FAA43A"]
|
||||
-8 -> 4 [style=bold, color="#FAA43A"]
|
||||
4 -> 6 [label="b"]
|
||||
4 -> 4 [label="!b"]
|
||||
5 -> 6 [label="b"]
|
||||
5 -> 5 [label="a & !b"]
|
||||
6 -> 6 [label="1"]
|
||||
}
|
||||
}
|
||||
EOF
|
||||
|
||||
|
|
@ -353,7 +353,7 @@ State: 0
|
|||
EOF
|
||||
diff out5 expect
|
||||
|
||||
# Test if split option is correct
|
||||
# Test if split option with color is correct
|
||||
cat >ex6<<EOF
|
||||
HOA: v1.1
|
||||
States: 2
|
||||
|
|
@ -373,6 +373,7 @@ EOF
|
|||
|
||||
run 0 autfilt --dot='baryf(Lato)' ex6 > ex6.dot
|
||||
|
||||
style='arrowhead=onormal'
|
||||
cat >expect6.dot<<EOF
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
|
|
@ -389,11 +390,11 @@ digraph G {
|
|||
-1 -> 1
|
||||
0 [label=<0>]
|
||||
0 -> 0 [label=<!a & !c>]
|
||||
0 -> -1.1 [label=<a & b & !c>, style=bold, color="#F17CB0", arrowhead=onormal]
|
||||
0 -> -1.1 [label=<a & b & !c>, style=bold, color="#F17CB0", $style]
|
||||
-1.1 [label=<>,shape=point]
|
||||
-1.1 -> 0 [style=bold, color="#F17CB0"]
|
||||
-1.1 -> 1 [style=bold, color="#F17CB0"]
|
||||
0 -> -1.2 [label=<a & !c>, style=bold, color="#FAA43A", arrowhead=onormal]
|
||||
0 -> -1.2 [label=<a & !c>, style=bold, color="#FAA43A", $style]
|
||||
-1.2 [label=<>,shape=point]
|
||||
-1.2 -> 0 [style=bold, color="#FAA43A"]
|
||||
-1.2 -> 1 [style=bold, color="#FAA43A"]
|
||||
|
|
@ -690,6 +691,79 @@ EOF
|
|||
|
||||
diff ex10.dot expect10.dot
|
||||
|
||||
cat >ex11 <<EOF
|
||||
HOA: v1
|
||||
tool: "LTL3HOA"
|
||||
name: "SLAA for G((b & Fa) | (!b & G!a))"
|
||||
States: 4
|
||||
AP: 2 "b" "a"
|
||||
Start: 0
|
||||
Acceptance: 1 Fin(0)
|
||||
--BODY--
|
||||
State: 0 "G((b & Fa) | (!b & G!a))"
|
||||
[(0 & 1)] 0
|
||||
[(0 & !1)] 0&1
|
||||
[(!0 & !1)] 0&2
|
||||
State: 1 "Fa"
|
||||
[(1)] 3
|
||||
[(!1)] 1 {1}
|
||||
State: 2 "G!a"
|
||||
[(!1)] 2
|
||||
State: 3 "t"
|
||||
[t] 3
|
||||
--END--
|
||||
EOF
|
||||
|
||||
run 2 autfilt --dot='sbarf(Lato)' ex11 > ex11.dot
|
||||
|
||||
cat >expect11.dot <<EOF
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
label=<Fin(<font color="#5DA5DA">⓿</font>)>
|
||||
labelloc="t"
|
||||
fontname="Lato"
|
||||
node [fontname="Lato"]
|
||||
edge [fontname="Lato"]
|
||||
I [label="", style=invis, width=0]
|
||||
I -> 0
|
||||
subgraph cluster_0 {
|
||||
color=green
|
||||
label=""
|
||||
3 [label="t"]
|
||||
3 -> 3 [label=<1>]
|
||||
}
|
||||
subgraph cluster_1 {
|
||||
color=green
|
||||
label=""
|
||||
1 [label="Fa"]
|
||||
1 -> 3 [label=<a>]
|
||||
1 -> 1 [label=<!a>]
|
||||
}
|
||||
subgraph cluster_2 {
|
||||
color=green
|
||||
label=""
|
||||
2 [label="G!a"]
|
||||
2 -> 2 [label=<!a>]
|
||||
}
|
||||
subgraph cluster_3 {
|
||||
color=green
|
||||
label=""
|
||||
0 [label="G((b & Fa) | (!b & G!a))"]
|
||||
0 -> 0 [label=<a & b>]
|
||||
0 -> -1.3 [label=<!a & b>, arrowhead=onormal]
|
||||
-1.3 [label=<>,shape=point]
|
||||
-1.3 -> 0
|
||||
-1.3 -> 1
|
||||
0 -> -4.3 [label=<!a & !b>, arrowhead=onormal]
|
||||
-4.3 [label=<>,shape=point]
|
||||
-4.3 -> 0
|
||||
-4.3 -> 2
|
||||
}
|
||||
}
|
||||
EOF
|
||||
|
||||
diff ex11.dot expect11.dot
|
||||
|
||||
# Detect cases where alternation-removal cannot work.
|
||||
cat >in <<EOF
|
||||
HOA: v1
|
||||
|
|
|
|||
|
|
@ -336,15 +336,15 @@ digraph G {
|
|||
color=green
|
||||
label=""
|
||||
1 [label="1", peripheries=2]
|
||||
1 -> 1 [label="1"]
|
||||
}
|
||||
subgraph cluster_1 {
|
||||
color=red
|
||||
label=""
|
||||
0 [label="0"]
|
||||
}
|
||||
0 -> 1 [label="b"]
|
||||
0 -> 0 [label="0"]
|
||||
1 -> 1 [label="1"]
|
||||
}
|
||||
}
|
||||
EOF
|
||||
diff stdout expected
|
||||
|
|
|
|||
|
|
@ -327,21 +327,21 @@ digraph G {
|
|||
subgraph cluster_0 {
|
||||
color=green
|
||||
1 [label="s1", peripheries=2]
|
||||
1 -> 1 [label="a"]
|
||||
}
|
||||
subgraph cluster_1 {
|
||||
color=green
|
||||
0 [label="s0", peripheries=2]
|
||||
0 -> 0 [label="b"]
|
||||
}
|
||||
subgraph cluster_2 {
|
||||
color=black
|
||||
3 [label="s3"]
|
||||
}
|
||||
0 -> 0 [label="b"]
|
||||
1 -> 1 [label="a"]
|
||||
2 [label="s2"]
|
||||
2 -> 0 [label="b"]
|
||||
3 -> 1 [label="a"]
|
||||
3 -> 0 [label="b"]
|
||||
}
|
||||
2 [label="s2"]
|
||||
2 -> 0 [label="b"]
|
||||
}
|
||||
EOF
|
||||
|
||||
|
|
|
|||
|
|
@ -83,67 +83,67 @@ digraph G {
|
|||
color=grey
|
||||
label=""
|
||||
5 [label="5"]
|
||||
5 -> 6 [label="1"]
|
||||
6 [label="6"]
|
||||
6 -> 5 [label="1"]
|
||||
}
|
||||
subgraph cluster_1 {
|
||||
color=grey
|
||||
label=""
|
||||
0 [label="0"]
|
||||
0 -> 0 [label="a & b\n{0,1,2}"]
|
||||
0 -> 0 [label="!a & !b\n{2}"]
|
||||
0 -> 5 [label="a\n{2}"]
|
||||
}
|
||||
subgraph cluster_2 {
|
||||
color=green
|
||||
label=""
|
||||
9 [label="9"]
|
||||
9 -> 9 [label="!a & b\n{0,2}"]
|
||||
9 -> 10 [label="a & b\n{0,1}"]
|
||||
10 [label="10"]
|
||||
10 -> 9 [label="!a & b\n{0,1}"]
|
||||
10 -> 10 [label="a & b\n{0,2}"]
|
||||
}
|
||||
subgraph cluster_3 {
|
||||
color=green
|
||||
label=""
|
||||
8 [label="8"]
|
||||
8 -> 8 [label="!a & b\n{0,2}"]
|
||||
8 -> 8 [label="a & b\n{0,1}"]
|
||||
8 -> 9 [label="1"]
|
||||
}
|
||||
subgraph cluster_4 {
|
||||
color=green
|
||||
label=""
|
||||
7 [label="7"]
|
||||
7 -> 7 [label="!a & b\n{0,1}"]
|
||||
7 -> 7 [label="a & b\n{0,2}"]
|
||||
7 -> 8 [label="1"]
|
||||
}
|
||||
subgraph cluster_5 {
|
||||
color=black
|
||||
label=""
|
||||
2 [label="2"]
|
||||
2 -> 0 [label="a"]
|
||||
2 -> 7 [label="b"]
|
||||
}
|
||||
subgraph cluster_6 {
|
||||
color=red
|
||||
label=""
|
||||
4 [label="4"]
|
||||
4 -> 4 [label="!b\n{1,2}"]
|
||||
4 -> 2 [label="b"]
|
||||
}
|
||||
subgraph cluster_7 {
|
||||
color=green
|
||||
label=""
|
||||
1 [label="1"]
|
||||
3 [label="3"]
|
||||
}
|
||||
0 -> 0 [label="a & b\n{0,1,2}"]
|
||||
0 -> 0 [label="!a & !b\n{2}"]
|
||||
0 -> 5 [label="a\n{2}"]
|
||||
1 -> 4 [label="b"]
|
||||
1 -> 3 [label="a & !b"]
|
||||
2 -> 0 [label="a"]
|
||||
2 -> 7 [label="b"]
|
||||
3 [label="3"]
|
||||
3 -> 1 [label="a & b\n{0,1}"]
|
||||
4 -> 4 [label="!b\n{1,2}"]
|
||||
4 -> 2 [label="b"]
|
||||
5 -> 6 [label="1"]
|
||||
6 -> 5 [label="1"]
|
||||
7 -> 7 [label="!a & b\n{0,1}"]
|
||||
7 -> 7 [label="a & b\n{0,2}"]
|
||||
7 -> 8 [label="1"]
|
||||
8 -> 8 [label="!a & b\n{0,2}"]
|
||||
8 -> 8 [label="a & b\n{0,1}"]
|
||||
8 -> 9 [label="1"]
|
||||
9 -> 9 [label="!a & b\n{0,2}"]
|
||||
9 -> 10 [label="a & b\n{0,1}"]
|
||||
10 -> 9 [label="!a & b\n{0,1}"]
|
||||
10 -> 10 [label="a & b\n{0,2}"]
|
||||
}
|
||||
}
|
||||
EOF
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue