dot: make "a" the default
Fixes #319. * spot/twaalgos/dot.cc: Enable "a" by default. * bin/common_aoutput.cc, NEWS: Document it. * doc/org/autfilt.org, doc/org/concepts.org, doc/org/dstar2tgba.org, doc/org/hierarchy.org, doc/org/ltl2tgba.org, doc/org/oaut.org, doc/org/randaut.org, doc/org/satmin.org, doc/org/tut23.org, doc/org/tut24.org, doc/org/tut30.org, doc/org/tut31.org: Adjust or simplify the documentation. * tests/core/det.test, tests/core/dstar.test, tests/core/monitor.test, tests/core/neverclaimread.test, tests/core/readsave.test, tests/core/tgbagraph.test, tests/core/wdba.test, tests/python/_autparserr.ipynb, tests/python/automata-io.ipynb, tests/python/automata.ipynb, tests/python/highlighting.ipynb tests/python/ltsmin-dve.ipynb, tests/python/ltsmin-pml.ipynb, tests/python/product.ipynb, tests/python/testingaut.ipynb, tests/python/word.ipynb: Adjust test cases.
This commit is contained in:
Alexandre Duret-Lutz
parent
15fdac6059
commit
2a308182db
31 changed files with 1357 additions and 1429 deletions
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2013-2017 Laboratoire de Recherche et Développement de
|
||||
# Copyright (C) 2013-2018 Laboratoire de Recherche et Développement de
|
||||
# l'Epita (LRDE).
|
||||
#
|
||||
# This file is part of Spot, a model checking library.
|
||||
|
|
@ -116,6 +116,8 @@ run 0 ../ikwiad -x -DC 'GFa & XGFb' > out.tgba
|
|||
cat >ex.tgba <<EOF
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
label="\n[Büchi]"
|
||||
labelloc="t"
|
||||
node [shape="circle"]
|
||||
I [label="", style=invis, width=0]
|
||||
I -> 0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2013, 2014, 2015, 2016 Laboratoire de Recherche et
|
||||
# Copyright (C) 2013-2016, 2018 Laboratoire de Recherche et
|
||||
# Développement de l'Epita (LRDE).
|
||||
#
|
||||
# This file is part of Spot, a model checking library.
|
||||
|
|
@ -61,6 +61,8 @@ run 0 ../ikwiad -d -XD dra.dstar | tee stdout
|
|||
cat >expected <<EOF
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
label="Fin(0) & Inf(1)\n[Rabin 1]"
|
||||
labelloc="t"
|
||||
node [shape="circle"]
|
||||
I [label="", style=invis, width=0]
|
||||
I -> 0
|
||||
|
|
@ -83,6 +85,8 @@ run 0 ../ikwiad -d -XDB -R3 dra.dstar | tee stdout
|
|||
cat >expected <<EOF
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
label="\n[Büchi]"
|
||||
labelloc="t"
|
||||
node [shape="circle"]
|
||||
I [label="", style=invis, width=0]
|
||||
I -> 0
|
||||
|
|
@ -128,6 +132,8 @@ run 0 ../ikwiad -d -XDB dsa.dstar | tee stdout
|
|||
cat >expected <<EOF
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
label="\n[Büchi]"
|
||||
labelloc="t"
|
||||
node [shape="circle"]
|
||||
I [label="", style=invis, width=0]
|
||||
I -> 1
|
||||
|
|
@ -212,7 +218,7 @@ State: 3 "str\n\"ing" Acc-Sig: -0 +1 3 3 3 3
|
|||
State: 4 "more\"string\"" Acc-Sig: +0 +1 3 4 3 4
|
||||
EOF
|
||||
|
||||
run 0 autfilt -d -B dra.dstar | tee stdout
|
||||
run 0 autfilt -dA -B dra.dstar | tee stdout
|
||||
|
||||
cat >expected <<EOF
|
||||
digraph G {
|
||||
|
|
@ -281,7 +287,7 @@ State: 0
|
|||
Acc-Sig:
|
||||
0
|
||||
EOF
|
||||
run 0 dstar2tgba --name=%F --dot=nt aut.dsa | tee stdout
|
||||
run 0 dstar2tgba --name=%F --dot=Ant aut.dsa | tee stdout
|
||||
|
||||
cat >expected<<EOF
|
||||
digraph G {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2014-2017 Laboratoire de Recherche et Développement de
|
||||
# Copyright (C) 2014-2018 Laboratoire de Recherche et Développement de
|
||||
# l'Epita (LRDE).
|
||||
#
|
||||
# This file is part of Spot, a model checking library.
|
||||
|
|
@ -31,7 +31,7 @@ expect()
|
|||
diff output.out output.exp
|
||||
}
|
||||
|
||||
expect ltl2tgba -d --monitor a <<EOF
|
||||
expect ltl2tgba -dA --monitor a <<EOF
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
node [shape="circle"]
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2017 Laboratoire
|
||||
# Copyright (C) 2010-2015, 2017-2018 Laboratoire
|
||||
# de Recherche et Développement de l'Epita (LRDE).
|
||||
#
|
||||
# This file is part of Spot, a model checking library.
|
||||
|
|
@ -134,6 +134,8 @@ run 0 ../ikwiad -XN input > stdout
|
|||
cat >expected <<EOF
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
label="\n[Büchi]"
|
||||
labelloc="t"
|
||||
node [shape="circle"]
|
||||
I [label="", style=invis, width=0]
|
||||
I -> 0
|
||||
|
|
@ -327,7 +329,7 @@ autfilt --name=%F --dot=nsc <input >stdout 2>stderr && exit 1
|
|||
cat >expected <<EOF
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
label="-"
|
||||
label="-\n[Büchi]"
|
||||
labelloc="t"
|
||||
node [shape="circle"]
|
||||
I [label="", style=invis, width=0]
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2009, 2010, 2012, 2014, 2015, 2016, 2017 Laboratoire de
|
||||
# Copyright (C) 2009, 2010, 2012, 2014-2018 Laboratoire de
|
||||
# Recherche et Développement de l'Epita (LRDE).
|
||||
# Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
# département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
||||
|
|
@ -391,7 +391,7 @@ EOF
|
|||
diff output expected
|
||||
|
||||
|
||||
SPOT_DOTDEFAULT=bra ltl2tgba --dot='e.f(Lato)' 'GFa & GFb' >output
|
||||
SPOT_DOTDEFAULT=bra ltl2tgba --dot='Ae.f(Lato)' 'GFa & GFb' >output
|
||||
cat output
|
||||
|
||||
zero='<font color="#1F78B4">⓿</font>'
|
||||
|
|
@ -562,7 +562,7 @@ EOF
|
|||
|
||||
# States should be circled even if <5 causes all states to be named,
|
||||
# because the names are smaller then 2 characters anyway.
|
||||
ltl2tgba --det 'Ga | Gb | Gc' -d'<5' | grep -v '>' >out
|
||||
ltl2tgba --det 'Ga | Gb | Gc' -d'A<5' | grep -v '>' >out
|
||||
diff out expected3
|
||||
|
||||
# Let's pretend that this is some used supplied input, as discussed in
|
||||
|
|
@ -867,7 +867,7 @@ EOF
|
|||
|
||||
diff output6 expect6
|
||||
|
||||
run 0 autfilt -dk input6 >output6d
|
||||
run 0 autfilt -dAk input6 >output6d
|
||||
cat >expect6d <<EOF
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
|
|
@ -1006,7 +1006,7 @@ State: 2
|
|||
[0&!2] 2
|
||||
--END--
|
||||
EOF
|
||||
autfilt -d input9 > output9
|
||||
autfilt -dA input9 > output9
|
||||
cat >expected9 <<EOF
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
|
|
@ -1031,7 +1031,7 @@ diff output9 expected9
|
|||
autfilt input9 -H1 | autfilt -H1 | grep highlight && exit 1
|
||||
autfilt input9 -H1 | autfilt -H1.1 | grep highlight && exit 1
|
||||
autfilt -H1.1 input9 | autfilt -H1.1 | grep highlight
|
||||
autfilt -H1.1 input9 | autfilt -d > output9b
|
||||
autfilt -H1.1 input9 | autfilt -dA > output9b
|
||||
diff output9 output9b
|
||||
|
||||
test 2 = `ltl2tgba 'GFa' 'a U b' 'a U b U c'| autfilt --ap=2..3 --count`
|
||||
|
|
@ -1042,7 +1042,7 @@ test 2 = `genltl --dac=1..3 | ltl2tgba --stats='%e,"%h",%s' |
|
|||
autfilt --states=2..3 -F-/3 --stats='%<,"%h"' | wc -l`
|
||||
|
||||
# --dot=d
|
||||
ltl2tgba 'GF(a <-> Fb)' | autfilt -B --dot=d | grep ' (' >out
|
||||
ltl2tgba 'GF(a <-> Fb)' | autfilt -B --dot=dA | grep ' (' >out
|
||||
cat >expected <<EOF
|
||||
0 [label="0 (0)", peripheries=2]
|
||||
1 [label="1 (0)"]
|
||||
|
|
@ -1052,7 +1052,7 @@ cat >expected <<EOF
|
|||
EOF
|
||||
diff out expected
|
||||
# --dot=d should also not use circles
|
||||
ltl2tgba 'a U b' | autfilt --remove-ap=b=0 --dot=d >out
|
||||
ltl2tgba 'a U b' | autfilt --remove-ap=b=0 --dot=dA >out
|
||||
cat >expected <<EOF
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
|
|
|
|||
|
|
@ -37,6 +37,8 @@ p1
|
|||
p2
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
label="t\n[Fin-less 2]"
|
||||
labelloc="t"
|
||||
node [shape="circle"]
|
||||
I [label="", style=invis, width=0]
|
||||
I -> 0
|
||||
|
|
@ -53,6 +55,8 @@ digraph G {
|
|||
}
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
label="t\n[Fin-less 2]"
|
||||
labelloc="t"
|
||||
node [shape="circle"]
|
||||
I [label="", style=invis, width=0]
|
||||
I -> 0
|
||||
|
|
@ -67,6 +71,8 @@ digraph G {
|
|||
}
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
label="t\n[Fin-less 2]"
|
||||
labelloc="t"
|
||||
node [shape="circle"]
|
||||
I [label="", style=invis, width=0]
|
||||
I -> 0
|
||||
|
|
@ -80,6 +86,8 @@ digraph G {
|
|||
}
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
label="t\n[Fin-less 2]"
|
||||
labelloc="t"
|
||||
node [shape="circle"]
|
||||
I [label="", style=invis, width=0]
|
||||
I -> 0
|
||||
|
|
@ -96,6 +104,8 @@ digraph G {
|
|||
}
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
label="t\n[Fin-less 2]"
|
||||
labelloc="t"
|
||||
node [shape="circle"]
|
||||
I [label="", style=invis, width=0]
|
||||
I -> 0
|
||||
|
|
@ -110,6 +120,8 @@ digraph G {
|
|||
}
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
label="t\n[Fin-less 2]"
|
||||
labelloc="t"
|
||||
I [label="", style=invis, width=0]
|
||||
I -> 0
|
||||
0 [label="0"]
|
||||
|
|
@ -223,6 +235,8 @@ digraph G {
|
|||
}
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
label="t\n[all]"
|
||||
labelloc="t"
|
||||
node [shape="circle"]
|
||||
I [label="", style=invis, width=0]
|
||||
I -> 2
|
||||
|
|
@ -235,6 +249,8 @@ digraph G {
|
|||
2 -> 0
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
label="t\n[all]"
|
||||
labelloc="t"
|
||||
node [shape="circle"]
|
||||
I [label="", style=invis, width=0]
|
||||
I -> 0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2010, 2014, 2015 Laboratoire de Recherche et
|
||||
# Copyright (C) 2010, 2014, 2015, 2018 Laboratoire de Recherche et
|
||||
# Développement de l'Epita (LRDE).
|
||||
#
|
||||
# This file is part of Spot, a model checking library.
|
||||
|
|
@ -99,7 +99,7 @@ while read f; do
|
|||
# worked.
|
||||
x=`../ikwiad -f -Rm "!($f)" |
|
||||
grep -v -- '->' |
|
||||
sed -n 's/.*label="\(..*\)".*/\1/p' |
|
||||
sed -n 's/.*\[.*label="\(..*\)".*/\1/p' |
|
||||
tr -d '0-9\n'`
|
||||
case $x in
|
||||
"") echo "OK !($f)";;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue