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

dot: heuristic to switch between circles and ellipses

Browse source 
* src/twaalgos/dotty.cc: Add an option (e) to force elliptic shape, and
a heuristic to choose between circle and ellipse by default.
* src/bin/common_aoutput.cc, src/bin/dstar2tgba.cc: Document 'e'.
* src/taalgos/dotty.cc: Ignore 'e'.
* wrap/python/spot.py (setup): Do not force circular states.  The
default should be fine.
* src/tests/det.test, src/tests/dstar.test, src/tests/monitor.test,
src/tests/neverclaimread.test, src/tests/readsave.test,
src/tests/sccdot.test, src/tests/tgbagraph.test: Adjust expected
results.
* NEWS: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2015-04-28 18:22:08 +02:00
parent 8aa88c2951
commit a4b63e8e7f
13 changed files with 65 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/tests/det.test
View file

@ -118,6 +118,7 @@ run 0 ../ltl2tgba -x -DC 'GFa & XGFb' > out.tgba
cat >ex.tgba <<EOF
digraph G {
rankdir=LR
node [shape="circle"]
I [label="", style=invis, width=0]
I -> 0
0 [label="0"]

5
src/tests/dstar.test
View file

@ -61,6 +61,7 @@ run 0 ../ltl2tgba -XD dra.dstar | tee stdout
cat >expected <<EOF
digraph G {
rankdir=LR
node [shape="circle"]
I [label="", style=invis, width=0]
I -> 0
0 [label="0"]
@ -82,6 +83,7 @@ run 0 ../ltl2tgba -XDD dra.dstar | tee stdout
cat >expected <<EOF
digraph G {
rankdir=LR
node [shape="circle"]
I [label="", style=invis, width=0]
I -> 0
0 [label="0"]
@ -126,6 +128,7 @@ run 0 ../ltl2tgba -XDB dsa.dstar | tee stdout
cat >expected <<EOF
digraph G {
rankdir=LR
node [shape="circle"]
I [label="", style=invis, width=0]
I -> 0
0 [label="0"]
@ -215,6 +218,7 @@ run 0 ../ltl2tgba -XDD dra.dstar | tee stdout
cat >expected <<EOF
digraph G {
rankdir=LR
node [shape="circle"]
I [label="", style=invis, width=0]
I -> 0
0 [label="0"]
@ -264,6 +268,7 @@ digraph G {
rankdir=LR
label="aut.dsa"
labelloc="t"
node [shape="circle"]
I [label="", style=invis, width=0]
I -> 0
0 [label="0"]

1
src/tests/monitor.test
View file

@ -34,6 +34,7 @@ expect()
expect ../../bin/ltl2tgba --monitor a <<EOF
digraph G {
rankdir=LR
node [shape="circle"]
I [label="", style=invis, width=0]
I -> 1
0 [label="0"]

1
src/tests/neverclaimread.test
View file

@ -134,6 +134,7 @@ run 0 ../ltl2tgba -XN input > stdout
cat >expected <<EOF
digraph G {
rankdir=LR
node [shape="circle"]
I [label="", style=invis, width=0]
I -> 0
0 [label="0", peripheries=2]

9
src/tests/readsave.test
View file

@ -349,6 +349,7 @@ digraph G {
rankdir=LR
label="Inf(0)&Inf(1)"
labelloc="t"
node [shape="circle"]
I [label="", style=invis, width=0]
I -> 0
0 [label="0"]
@ -367,6 +368,7 @@ digraph G {
rankdir=LR
label="G(Fa & Fb)\nInf(⓿)&Inf(❶)"
labelloc="t"
node [shape="circle"]
I [label="", style=invis, width=0]
I -> 0
0 [label="0"]
@ -379,7 +381,7 @@ EOF
diff output expected
SPOT_DOTDEFAULT=bra $ltl2tgba --dot='c.f(Lato)' 'GFa & GFb' >output
SPOT_DOTDEFAULT=bra $ltl2tgba --dot='e.f(Lato)' 'GFa & GFb' >output
cat output
zero='<font color="#5DA5DA">⓿</font>'
@ -389,7 +391,6 @@ digraph G {
rankdir=LR
label=<Inf($zero)&amp;Inf($one)>
labelloc="t"
node [shape="circle"]
fontname="Lato"
node [fontname="Lato"]
edge [fontname="Lato"]
@ -515,6 +516,7 @@ digraph G {
rankdir=LR
label="Fin(⓿) | (Fin(❶) & Inf(❷)) | Fin(❸)"
labelloc="t"
node [shape="circle"]
I [label="", style=invis, width=0]
0 [label="0"]
1 [label="1\n⓿❸"]
@ -529,7 +531,8 @@ digraph G {
}
EOF
# This should remove the state names
# This should remove the state names, and automatically use circled
# states.
$autfilt --dot=bao1 in | grep -v '>' >out
diff out expected2

1
src/tests/sccdot.test
View file

@ -76,6 +76,7 @@ digraph G {
rankdir=LR
label="Fin(2) & (Inf(0)&Inf(1))"
labelloc="t"
node [shape="circle"]
I [label="", style=invis, width=0]
I -> 1
subgraph cluster_0 {

9
src/tests/tgbagraph.test
View file

@ -1,7 +1,7 @@
#!/bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2014 Laboratoire de Recherche et Développement de
# l'Epita (LRDE).
# Copyright (C) 2014, 2015 Laboratoire de Recherche et Développement
# de l'Epita (LRDE).
#
# This file is part of Spot, a model checking library.
#
@ -35,6 +35,7 @@ run 0 ../tgbagraph | tee stdout
cat >expected <<EOF
digraph G {
rankdir=LR
node [shape="circle"]
I [label="", style=invis, width=0]
I -> 0
0 [label="0"]
@ -50,6 +51,7 @@ digraph G {
}
digraph G {
rankdir=LR
node [shape="circle"]
I [label="", style=invis, width=0]
I -> 0
0 [label="0"]
@ -63,6 +65,7 @@ digraph G {
}
digraph G {
rankdir=LR
node [shape="circle"]
I [label="", style=invis, width=0]
I -> 0
0 [label="0"]
@ -75,6 +78,7 @@ digraph G {
}
digraph G {
rankdir=LR
node [shape="circle"]
I [label="", style=invis, width=0]
I -> 0
0 [label="0"]
@ -90,6 +94,7 @@ digraph G {
}
digraph G {
rankdir=LR
node [shape="circle"]
I [label="", style=invis, width=0]
I -> 0
0 [label="0"]