dot: name the digraph
* spot/twaalgos/dot.cc: Here. * NEWS: Mention the change. * tests/core/alternating.test, tests/core/det.test, tests/core/dstar.test, tests/core/monitor.test, tests/core/neverclaimread.test, tests/core/readsave.test, tests/core/sccdot.test, tests/core/tgbagraph.test, tests/python/_altscc.ipynb, tests/python/_autparserr.ipynb, tests/python/alternation.ipynb, tests/python/atva16-fig2a.ipynb, tests/python/atva16-fig2b.ipynb, tests/python/automata-io.ipynb, tests/python/automata.ipynb, tests/python/decompose.ipynb, tests/python/gen.ipynb, tests/python/highlighting.ipynb, tests/python/ltsmin-dve.ipynb, tests/python/ltsmin-pml.ipynb, tests/python/parity.ipynb, tests/python/product.ipynb, tests/python/randaut.ipynb, tests/python/satmin.ipynb, tests/python/stutter-inv.ipynb, tests/python/testingaut.ipynb, tests/python/word.ipynb: Adjust test cases.
This commit is contained in:
Alexandre Duret-Lutz
parent
2775b0abc8
commit
6cec43294d
29 changed files with 12223 additions and 10271 deletions
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2016, 2017 Laboratoire de Recherche et Développement
|
||||
# Copyright (C) 2016-2018 Laboratoire de Recherche et Développement
|
||||
# de l'Epita (LRDE).
|
||||
#
|
||||
# This file is part of Spot, a model checking library.
|
||||
|
|
@ -56,7 +56,7 @@ EOF
|
|||
autfilt --dot=bans alt.hoa >alt.dot
|
||||
|
||||
cat >expect.dot <<EOF
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
label="Fin(⓿)\n[co-Büchi]"
|
||||
labelloc="t"
|
||||
|
|
@ -498,7 +498,7 @@ run 0 autfilt --dot='baryf(Lato)' ex6 > ex6.dot
|
|||
|
||||
style='arrowhead=onormal'
|
||||
cat >expect6.dot<<EOF
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
label=<Fin(<font color="#1F78B4">⓿</font>)<br/>[co-Büchi]>
|
||||
labelloc="t"
|
||||
|
|
@ -561,7 +561,7 @@ run 0 autfilt --dot='sbarf(Lato)' ex7 > ex7.dot
|
|||
color='<font color="#1F78B4">⓿</font>'
|
||||
color1='<font color="#FF4DA0">❶</font>'
|
||||
cat >expect7.dot<<EOF
|
||||
digraph G {
|
||||
digraph "SLAA for c R (c | G(a & b) | (F!b & F!a))" {
|
||||
rankdir=LR
|
||||
label=<Fin($color1) & Fin($color)<br/>[Streett-like 2]>
|
||||
labelloc="t"
|
||||
|
|
@ -657,7 +657,7 @@ EOF
|
|||
run 0 autfilt --dot='sbarf(Lato)' ex8 > ex8.dot
|
||||
|
||||
cat >expect8.dot<<EOF
|
||||
digraph G {
|
||||
digraph "SLAA for c R (c | G(a & b) | (F!b & F!a))" {
|
||||
rankdir=LR
|
||||
label=<Fin($color1) & Fin($color)<br/>[Streett-like 2]>
|
||||
labelloc="t"
|
||||
|
|
@ -737,7 +737,7 @@ EOF
|
|||
run 0 autfilt --dot='baryf(Lato)' ex9 > ex9.dot
|
||||
|
||||
cat >expect9.dot <<EOF
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
label=<Fin(<font color="#1F78B4">⓿</font>)<br/>[co-Büchi]>
|
||||
labelloc="t"
|
||||
|
|
@ -784,7 +784,7 @@ EOF
|
|||
run 0 autfilt --dot='baryf(Lato)' ex10 > ex10.dot
|
||||
|
||||
cat >expect10.dot <<EOF
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
label=<Fin(<font color="#1F78B4">⓿</font>)<br/>[co-Büchi]>
|
||||
labelloc="t"
|
||||
|
|
@ -840,7 +840,7 @@ EOF
|
|||
run 2 autfilt --dot='sbarf(Lato)' ex11 > ex11.dot
|
||||
|
||||
cat >expect11.dot <<EOF
|
||||
digraph G {
|
||||
digraph "SLAA for G((b & Fa) | (!b & G!a))" {
|
||||
rankdir=LR
|
||||
label=<Fin(<font color="#1F78B4">⓿</font>)<br/>[co-Büchi]>
|
||||
labelloc="t"
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ run 0 autfilt -q --are-isomorph ex.hoa out.hoa
|
|||
|
||||
run 0 ../ikwiad -x -DC 'GFa & XGFb' > out.tgba
|
||||
cat >ex.tgba <<EOF
|
||||
digraph G {
|
||||
digraph "GFa & XGFb" {
|
||||
rankdir=LR
|
||||
label="\n[Büchi]"
|
||||
labelloc="t"
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ EOF
|
|||
run 0 ../ikwiad -d -XD dra.dstar | tee stdout
|
||||
|
||||
cat >expected <<EOF
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
label="Fin(0) & Inf(1)\n[Rabin 1]"
|
||||
labelloc="t"
|
||||
|
|
@ -83,7 +83,7 @@ diff expected stdout
|
|||
run 0 ../ikwiad -d -XDB -R3 dra.dstar | tee stdout
|
||||
|
||||
cat >expected <<EOF
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
label="\n[Büchi]"
|
||||
labelloc="t"
|
||||
|
|
@ -130,7 +130,7 @@ EOF
|
|||
run 0 ../ikwiad -d -XDB dsa.dstar | tee stdout
|
||||
|
||||
cat >expected <<EOF
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
label="\n[Büchi]"
|
||||
labelloc="t"
|
||||
|
|
@ -221,7 +221,7 @@ EOF
|
|||
run 0 autfilt -dA -B dra.dstar | tee stdout
|
||||
|
||||
cat >expected <<EOF
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
node [shape="circle"]
|
||||
I [label="", style=invis, width=0]
|
||||
|
|
@ -245,7 +245,7 @@ digraph G {
|
|||
4 -> 3 [label="!a"]
|
||||
4 -> 4 [label="a"]
|
||||
}
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
node [shape="circle"]
|
||||
I [label="", style=invis, width=0]
|
||||
|
|
@ -290,7 +290,7 @@ EOF
|
|||
run 0 dstar2tgba --name=%F --dot=Ant aut.dsa | tee stdout
|
||||
|
||||
cat >expected<<EOF
|
||||
digraph G {
|
||||
digraph "aut.dsa" {
|
||||
rankdir=LR
|
||||
label="aut.dsa"
|
||||
labelloc="t"
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ expect()
|
|||
}
|
||||
|
||||
expect ltl2tgba -dA --monitor a <<EOF
|
||||
digraph G {
|
||||
digraph "a" {
|
||||
rankdir=LR
|
||||
node [shape="circle"]
|
||||
I [label="", style=invis, width=0]
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ EOF
|
|||
run 0 ../ikwiad -XN input > stdout
|
||||
|
||||
cat >expected <<EOF
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
label="\n[Büchi]"
|
||||
labelloc="t"
|
||||
|
|
@ -327,7 +327,7 @@ accept_all:
|
|||
EOF
|
||||
autfilt --name=%F --dot=nsc <input >stdout 2>stderr && exit 1
|
||||
cat >expected <<EOF
|
||||
digraph G {
|
||||
digraph "-" {
|
||||
rankdir=LR
|
||||
label="-\n[Büchi]"
|
||||
labelloc="t"
|
||||
|
|
|
|||
|
|
@ -319,7 +319,7 @@ autfilt -H input |
|
|||
autfilt >output
|
||||
|
||||
cat >expected <<EOF
|
||||
digraph G {
|
||||
digraph "" {
|
||||
node [shape="circle"]
|
||||
/* hello world */
|
||||
I [label="", style=invis, height=0]
|
||||
|
|
@ -355,7 +355,7 @@ test 1 = `autfilt -H input --complete | autfilt --is-complete --count`
|
|||
SPOT_DEFAULT_FORMAT=hoa ltl2tgba --dot=ak 'GFa & GFb' >output
|
||||
cat output
|
||||
cat >expected <<EOF
|
||||
digraph G {
|
||||
digraph "G(Fa & Fb)" {
|
||||
rankdir=LR
|
||||
label="Inf(0)&Inf(1)\n[gen. Büchi 2]"
|
||||
labelloc="t"
|
||||
|
|
@ -374,7 +374,7 @@ diff output expected
|
|||
ltl2tgba -dban 'GFa & GFb' >output
|
||||
cat output
|
||||
cat >expected <<EOF
|
||||
digraph G {
|
||||
digraph "G(Fa & Fb)" {
|
||||
rankdir=LR
|
||||
label="G(Fa & Fb)\nInf(⓿)&Inf(❶)\n[gen. Büchi 2]"
|
||||
labelloc="t"
|
||||
|
|
@ -397,7 +397,7 @@ cat output
|
|||
zero='<font color="#1F78B4">⓿</font>'
|
||||
one='<font color="#FF4DA0">❶</font>'
|
||||
cat >expected <<EOF
|
||||
digraph G {
|
||||
digraph "G(Fa & Fb)" {
|
||||
rankdir=LR
|
||||
label=<Inf($zero)&Inf($one)<br/>[gen. Büchi 2]>
|
||||
labelloc="t"
|
||||
|
|
@ -468,7 +468,7 @@ State: 9 {0 2 3}
|
|||
EOF
|
||||
|
||||
cat >expected <<EOF
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
label="(Fin(⓿)|Fin(❸)) | (Fin(❶) & Inf(❷))\n[gen. Rabin 3]"
|
||||
labelloc="t"
|
||||
|
|
@ -522,7 +522,7 @@ autfilt --dot=bao in >out
|
|||
diff out expected
|
||||
|
||||
cat >expected2 <<EOF
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
label="(Fin(⓿)|Fin(❸)) | (Fin(❶) & Inf(❷))\n[gen. Rabin 3]"
|
||||
labelloc="t"
|
||||
|
|
@ -547,7 +547,7 @@ autfilt --dot=bao1 in | grep -v '>' >out
|
|||
diff out expected2
|
||||
|
||||
cat >expected3 <<EOF
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
node [shape="circle"]
|
||||
I [label="", style=invis, width=0]
|
||||
|
|
@ -869,7 +869,7 @@ diff output6 expect6
|
|||
|
||||
run 0 autfilt -dAk input6 >output6d
|
||||
cat >expect6d <<EOF
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
I [label="", style=invis, width=0]
|
||||
I -> 1
|
||||
|
|
@ -890,7 +890,7 @@ diff output6d expect6d
|
|||
|
||||
run 0 autfilt -dbark input6 >output6d2
|
||||
cat >expect6d2 <<EOF
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
label=<Inf(<font color="#1F78B4">⓿</font>)<br/>[Büchi]>
|
||||
labelloc="t"
|
||||
|
|
@ -1008,7 +1008,7 @@ State: 2
|
|||
EOF
|
||||
autfilt -dA input9 > output9
|
||||
cat >expected9 <<EOF
|
||||
digraph G {
|
||||
digraph "a U (b U c)" {
|
||||
rankdir=LR
|
||||
node [shape="circle"]
|
||||
I [label="", style=invis, width=0]
|
||||
|
|
@ -1052,9 +1052,9 @@ cat >expected <<EOF
|
|||
EOF
|
||||
diff out expected
|
||||
# --dot=d should also not use circles
|
||||
ltl2tgba 'a U b' | autfilt --remove-ap=b=0 --dot=dA >out
|
||||
ltl2tgba 'a U b' | autfilt --remove-ap=b=0 --name=%M --dot=dA >out
|
||||
cat >expected <<EOF
|
||||
digraph G {
|
||||
digraph "a U b" {
|
||||
rankdir=LR
|
||||
I [label="", style=invis, width=0]
|
||||
I -> 0
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2015, 2017 Laboratoire de Recherche et Développement de
|
||||
# l'Epita
|
||||
# Copyright (C) 2015, 2017, 2018 Laboratoire de Recherche et
|
||||
# Développement de l'Epita
|
||||
#
|
||||
# This file is part of Spot, a model checking library.
|
||||
#
|
||||
|
|
@ -72,7 +72,7 @@ run 0 autfilt --dot=as in.hoa > out.dot
|
|||
|
||||
# The important stuff is the color=xxx lines
|
||||
cat <<EOF >expected
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
label="(Inf(0)&Inf(1)) & Fin(2)\n[Streett-like 3]"
|
||||
labelloc="t"
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ run 0 ../tgbagraph | tee stdout
|
|||
cat >expected <<EOF
|
||||
p1
|
||||
p2
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
label="t\n[Fin-less 2]"
|
||||
labelloc="t"
|
||||
|
|
@ -53,7 +53,7 @@ digraph G {
|
|||
2 -> 1 [label="!p1 | p2"]
|
||||
2 -> 2 [label="1\n{0,1}"]
|
||||
}
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
label="t\n[Fin-less 2]"
|
||||
labelloc="t"
|
||||
|
|
@ -69,7 +69,7 @@ digraph G {
|
|||
2 [label="2"]
|
||||
2 -> 0 [label="p1 | p2\n{0,1}"]
|
||||
}
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
label="t\n[Fin-less 2]"
|
||||
labelloc="t"
|
||||
|
|
@ -84,7 +84,7 @@ digraph G {
|
|||
1 -> 2 [label="p1 & p2\n{0}"]
|
||||
2 [label="2"]
|
||||
}
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
label="t\n[Fin-less 2]"
|
||||
labelloc="t"
|
||||
|
|
@ -102,7 +102,7 @@ digraph G {
|
|||
2 -> 1 [label="!p1 | p2"]
|
||||
2 -> 0 [label="1\n{0,1}"]
|
||||
}
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
label="t\n[Fin-less 2]"
|
||||
labelloc="t"
|
||||
|
|
@ -118,7 +118,7 @@ digraph G {
|
|||
2 -> 0 [label="1\n{0,1}"]
|
||||
2 -> 1 [label="!p1 | p2"]
|
||||
}
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
label="t\n[Fin-less 2]"
|
||||
labelloc="t"
|
||||
|
|
@ -233,7 +233,7 @@ digraph G {
|
|||
101 [label="101"]
|
||||
102 [label="102"]
|
||||
}
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
label="t\n[all]"
|
||||
labelloc="t"
|
||||
|
|
@ -247,7 +247,7 @@ digraph G {
|
|||
0 -> deleted
|
||||
1 -> deleted
|
||||
2 -> 0
|
||||
digraph G {
|
||||
digraph "" {
|
||||
rankdir=LR
|
||||
label="t\n[all]"
|
||||
labelloc="t"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue