dot: fix #393
* spot/twaalgos/dot.cc: Add support for option 'E', and default to rectangle nodes for large labels. * bin/common_aoutput.cc, NEWS: Document it. * tests/core/alternating.test, tests/core/dstar.test, tests/core/readsave.test, tests/core/sccdot.test, tests/core/tgbagraph.test, tests/python/_product_weak.ipynb, tests/python/alternation.ipynb, tests/python/atva16-fig2b.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/pdegen.py, tests/python/satmin.ipynb, tests/python/stutter-inv.ipynb: Adjust all test cases.
This commit is contained in:
Alexandre Duret-Lutz
parent
3ea63e9a75
commit
a7051b32c8
21 changed files with 12774 additions and 12603 deletions
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2016-2018 Laboratoire de Recherche et Développement
|
||||
# de l'Epita (LRDE).
|
||||
# Copyright (C) 2016-2018, 2020 Laboratoire de Recherche et
|
||||
# Développement de l'Epita (LRDE).
|
||||
#
|
||||
# This file is part of Spot, a model checking library.
|
||||
#
|
||||
|
|
@ -62,6 +62,7 @@ digraph "" {
|
|||
rankdir=LR
|
||||
label="Fin(⓿)\n[co-Büchi]"
|
||||
labelloc="t"
|
||||
node [shape="box",style="rounded",width="0.5"]
|
||||
I [label="", style=invis, width=0]
|
||||
I -> -11 [arrowhead=onormal]
|
||||
subgraph cluster_0 {
|
||||
|
|
@ -88,7 +89,7 @@ digraph "" {
|
|||
color=green
|
||||
label=""
|
||||
3 [label="GF(b)"]
|
||||
-8 [label=<>,shape=point]
|
||||
-8 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
}
|
||||
subgraph cluster_5 {
|
||||
color=red
|
||||
|
|
@ -100,15 +101,15 @@ digraph "" {
|
|||
label=""
|
||||
0 [label="((((a) U (b)) && GF(b)) && FG(a))"]
|
||||
}
|
||||
-11 [label=<>,shape=point]
|
||||
-11 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
-11 -> 0
|
||||
-11 -> 2
|
||||
0 -> -1 [label="b", arrowhead=onormal]
|
||||
-1 [label=<>,shape=point]
|
||||
-1 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
-1 -> 1
|
||||
-1 -> 3
|
||||
0 -> -4 [label="a & !b", style=bold, color="#E31A1C", arrowhead=onormal]
|
||||
-4 [label=<>,shape=point]
|
||||
-4 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
-4 -> 1 [style=bold, color="#E31A1C"]
|
||||
-4 -> 3 [style=bold, color="#E31A1C"]
|
||||
-4 -> 5 [style=bold, color="#E31A1C"]
|
||||
|
|
@ -506,23 +507,23 @@ digraph "" {
|
|||
rankdir=LR
|
||||
label=<Fin(<font color="#1F78B4">⓿</font>)<br/>[co-Büchi]>
|
||||
labelloc="t"
|
||||
node [shape="circle"]
|
||||
node [shape="box",style="rounded",width="0.5"]
|
||||
fontname="Lato"
|
||||
node [fontname="Lato"]
|
||||
edge [fontname="Lato"]
|
||||
I [label="", style=invis, width=0]
|
||||
I -> -1 [arrowhead=onormal]
|
||||
-1 [label=<>,shape=point]
|
||||
-1 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
-1 -> 0
|
||||
-1 -> 1
|
||||
0 [label=<0>]
|
||||
0 -> 0 [label=<!a & !c>]
|
||||
0 -> -1.1 [label=<a & b & !c>, style=bold, color="#FF4DA0", $style]
|
||||
-1.1 [label=<>,shape=point]
|
||||
-1.1 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
-1.1 -> 0 [style=bold, color="#FF4DA0"]
|
||||
-1.1 -> 1 [style=bold, color="#FF4DA0"]
|
||||
0 -> -1.2 [label=<a & !c>, style=bold, color="#FF7F00", arrowhead=onormal]
|
||||
-1.2 [label=<>,shape=point]
|
||||
-1.2 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
-1.2 -> 0 [style=bold, color="#FF7F00"]
|
||||
-1.2 -> 1 [style=bold, color="#FF7F00"]
|
||||
1 [label=<1>]
|
||||
|
|
@ -569,6 +570,7 @@ 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"
|
||||
node [shape="box",style="rounded",width="0.5"]
|
||||
fontname="Lato"
|
||||
node [fontname="Lato"]
|
||||
edge [fontname="Lato"]
|
||||
|
|
@ -598,10 +600,10 @@ digraph "SLAA for c R (c | G(a & b) | (F!b & F!a))" {
|
|||
color=green
|
||||
label=""
|
||||
0 [label=<c R (c | G(a & b) | (F!b & F!a))>]
|
||||
-1 [label=<>,shape=point]
|
||||
-4 [label=<>,shape=point]
|
||||
-7 [label=<>,shape=point]
|
||||
-10 [label=<>,shape=point]
|
||||
-1 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
-4 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
-7 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
-10 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
}
|
||||
0 -> 4 [label=<c>]
|
||||
0 -> 0 [label=<!a & !b & !c>]
|
||||
|
|
@ -665,6 +667,7 @@ 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"
|
||||
node [shape="box",style="rounded",width="0.5"]
|
||||
fontname="Lato"
|
||||
node [fontname="Lato"]
|
||||
edge [fontname="Lato"]
|
||||
|
|
@ -689,11 +692,11 @@ digraph "SLAA for c R (c | G(a & b) | (F!b & F!a))" {
|
|||
color=green
|
||||
label=""
|
||||
0 [label=<c R (c | G(a & b) | (F!b & F!a))>]
|
||||
-1 [label=<>,shape=point]
|
||||
-4 [label=<>,shape=point]
|
||||
-7 [label=<>,shape=point]
|
||||
-1 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
-4 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
-7 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
1 [label=<G(a & b)>]
|
||||
-10 [label=<>,shape=point]
|
||||
-10 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
}
|
||||
0 -> 4 [label=<c>]
|
||||
0 -> 0 [label=<!a & !b & !c>]
|
||||
|
|
@ -745,7 +748,7 @@ digraph "" {
|
|||
rankdir=LR
|
||||
label=<Fin(<font color="#1F78B4">⓿</font>)<br/>[co-Büchi]>
|
||||
labelloc="t"
|
||||
node [shape="circle"]
|
||||
node [shape="box",style="rounded",width="0.5"]
|
||||
fontname="Lato"
|
||||
node [fontname="Lato"]
|
||||
edge [fontname="Lato"]
|
||||
|
|
@ -753,14 +756,14 @@ digraph "" {
|
|||
I -> 0
|
||||
0 [label=<0>]
|
||||
0 -> -1.1 [label=<b & c>, style=bold, color="#FF4DA0", arrowhead=onormal]
|
||||
-1.1 [label=<>,shape=point]
|
||||
-1.1 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
-1.1 -> 1 [style=bold, color="#FF4DA0"]
|
||||
-1.1 -> 2 [style=bold, color="#FF4DA0"]
|
||||
1 [label=<1>]
|
||||
1 -> -1.1 [label=<a & b>, style=bold, color="#FF4DA0", arrowhead=onormal]
|
||||
2 [label=<2>]
|
||||
2 -> -1.2 [label=<!a & !b & !c>, style=bold, color="#FF7F00", $style]
|
||||
-1.2 [label=<>,shape=point]
|
||||
-1.2 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
-1.2 -> 1 [style=bold, color="#FF7F00"]
|
||||
-1.2 -> 2 [style=bold, color="#FF7F00"]
|
||||
}
|
||||
|
|
@ -792,7 +795,7 @@ digraph "" {
|
|||
rankdir=LR
|
||||
label=<Fin(<font color="#1F78B4">⓿</font>)<br/>[co-Büchi]>
|
||||
labelloc="t"
|
||||
node [shape="circle"]
|
||||
node [shape="box",style="rounded",width="0.5"]
|
||||
fontname="Lato"
|
||||
node [fontname="Lato"]
|
||||
edge [fontname="Lato"]
|
||||
|
|
@ -800,17 +803,17 @@ digraph "" {
|
|||
I -> 0
|
||||
0 [label=<0>]
|
||||
0 -> -1.1 [label=<b & c>, style=bold, color="#FF4DA0", arrowhead=onormal]
|
||||
-1.1 [label=<>,shape=point]
|
||||
-1.1 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
-1.1 -> 1 [style=bold, color="#FF4DA0"]
|
||||
-1.1 -> 2 [style=bold, color="#FF4DA0"]
|
||||
1 [label=<1>]
|
||||
1 -> -1.3 [label=<a & b>, style=bold, color="#6A3D9A", arrowhead=onormal]
|
||||
-1.3 [label=<>,shape=point]
|
||||
-1.3 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
-1.3 -> 1 [style=bold, color="#6A3D9A"]
|
||||
-1.3 -> 2 [style=bold, color="#6A3D9A"]
|
||||
2 [label=<2>]
|
||||
2 -> -1.2 [label=<!a & !b & !c>, style=bold, color="#FF7F00", $style]
|
||||
-1.2 [label=<>,shape=point]
|
||||
-1.2 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
-1.2 -> 1 [style=bold, color="#FF7F00"]
|
||||
-1.2 -> 2 [style=bold, color="#FF7F00"]
|
||||
}
|
||||
|
|
@ -848,6 +851,7 @@ digraph "SLAA for G((b & Fa) | (!b & G!a))" {
|
|||
rankdir=LR
|
||||
label=<Fin(<font color="#1F78B4">⓿</font>)<br/>[co-Büchi]>
|
||||
labelloc="t"
|
||||
node [shape="box",style="rounded",width="0.5"]
|
||||
fontname="Lato"
|
||||
node [fontname="Lato"]
|
||||
edge [fontname="Lato"]
|
||||
|
|
@ -872,8 +876,8 @@ digraph "SLAA for G((b & Fa) | (!b & G!a))" {
|
|||
color=green
|
||||
label=""
|
||||
0 [label=<G((b & Fa) | (!b & G!a))>]
|
||||
-1 [label=<>,shape=point]
|
||||
-4 [label=<>,shape=point]
|
||||
-1 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
-4 [label=<>,shape=point,width=0.05,height=0.05]
|
||||
}
|
||||
0 -> 0 [label=<a & b>]
|
||||
0 -> -1 [label=<!a & b>, arrowhead=onormal]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue