sccinfo: introduce is_rejecting()
Because scc_info does not perform a full emptiness check, it is not always able to tell whether an SCC is accepting if the acceptance condition use Fin primitives. This introduce is_rejecting_scc() in addition to to is_accepting_scc(). Only one of them may be true, but they can both be false if scc_info has no idea whether the SCC is accepting. * src/tgbaalgos/sccinfo.cc, src/tgbaalgos/sccinfo.hh: Implement is_rejecting_scc(). * src/bin/ltlcross.cc, src/tgba/acc.cc, src/tgba/acc.hh, src/tgbaalgos/dtgbacomp.cc, src/tgbaalgos/isweakscc.cc, src/tgbaalgos/remfin.cc, src/tgbaalgos/safety.cc, src/tgbaalgos/sccfilter.cc: Use it. * src/tgbaalgos/dotty.cc: Use is_rejecting_scc() and is_accepting_scc() to color SCCs. * doc/org/oaut.org: Document the colors used. * src/tgbatest/neverclaimread.test, src/tgbatest/readsave.test: Adjust tests. * src/tgbatest/sccdot.test: New test case. * src/tgbatest/Makefile.am: Add it.
This commit is contained in:
Alexandre Duret-Lutz
parent
8658441839
commit
ebe4ffc507
16 changed files with 475 additions and 45 deletions
|
|
@ -98,6 +98,7 @@ TESTS = \
|
|||
randomize.test \
|
||||
lbttparse.test \
|
||||
scc.test \
|
||||
sccdot.test \
|
||||
sccsimpl.test \
|
||||
dbacomp.test \
|
||||
obligation.test \
|
||||
|
|
|
|||
|
|
@ -332,10 +332,12 @@ digraph G {
|
|||
I [label="", style=invis, width=0]
|
||||
I -> 0
|
||||
subgraph cluster_0 {
|
||||
color=green
|
||||
label=""
|
||||
1 [label="1", peripheries=2]
|
||||
}
|
||||
subgraph cluster_1 {
|
||||
color=red
|
||||
label=""
|
||||
0 [label="0"]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -314,12 +314,15 @@ digraph G {
|
|||
I [label="", style=invis, height=0]
|
||||
I -> 3
|
||||
subgraph cluster_0 {
|
||||
color=green
|
||||
1 [label="s1", peripheries=2]
|
||||
}
|
||||
subgraph cluster_1 {
|
||||
color=green
|
||||
0 [label="s0", peripheries=2]
|
||||
}
|
||||
subgraph cluster_2 {
|
||||
color=black
|
||||
3 [label="s3"]
|
||||
}
|
||||
0 -> 0 [label="b"]
|
||||
|
|
|
|||
149
src/tgbatest/sccdot.test
Executable file
149
src/tgbatest/sccdot.test
Executable file
|
|
@ -0,0 +1,149 @@
|
|||
#!/bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (C) 2015 Laboratoire de Recherche et Développement de
|
||||
# l'Epita
|
||||
#
|
||||
# This file is part of Spot, a model checking library.
|
||||
#
|
||||
# Spot is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Spot is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
||||
# License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
. ./defs
|
||||
|
||||
set -e
|
||||
|
||||
# Check the scc_info categorization of SCCs as accepting/rejecting
|
||||
# by looking at the dot output.
|
||||
cat <<EOF > in.hoa
|
||||
HOA: v1
|
||||
States: 11
|
||||
Start: 1
|
||||
AP: 2 "a" "b"
|
||||
acc-name: generalized-Buchi 2
|
||||
Acceptance: 3 Inf(0)&Inf(1)&Fin(2)
|
||||
--BODY--
|
||||
State: 0 {2}
|
||||
[0&1] 0 {0 1}
|
||||
[!0&!1] 0
|
||||
[0] 5
|
||||
State: 1
|
||||
[1] 4
|
||||
[0&!1] 3
|
||||
State: 4
|
||||
[!1] 4 {1 2}
|
||||
[1] 2
|
||||
State: 2
|
||||
[0] 0
|
||||
[1] 7
|
||||
State: 3
|
||||
[0&1] 1 {1 0}
|
||||
State: 5
|
||||
[t] 6
|
||||
State: 6
|
||||
[t] 5
|
||||
State: 7
|
||||
[!0&1] 7 {0 1} /* This state and the next one differs by */
|
||||
[0&1] 7 {0 2} /* the order of the self loops. */
|
||||
[t] 8
|
||||
State: 8
|
||||
[!0&1] 8 {0 2}
|
||||
[0&1] 8 {0 1}
|
||||
[t] 9
|
||||
State: 9
|
||||
[!0&1] 9 {0 2}
|
||||
[0&1] 10 {0 1}
|
||||
State: 10
|
||||
[!0&1] 9 {0 1}
|
||||
[0&1] 10 {0 2}
|
||||
--END--
|
||||
EOF
|
||||
|
||||
run 0 ../../bin/autfilt --dot=as in.hoa > out.dot
|
||||
|
||||
# The important stuff is the color=xxx lines
|
||||
cat <<EOF >expected
|
||||
digraph G {
|
||||
rankdir=LR
|
||||
label="Fin(2) & (Inf(0)&Inf(1))"
|
||||
labelloc="t"
|
||||
I [label="", style=invis, width=0]
|
||||
I -> 1
|
||||
subgraph cluster_0 {
|
||||
color=grey
|
||||
label=""
|
||||
5 [label="5"]
|
||||
6 [label="6"]
|
||||
}
|
||||
subgraph cluster_1 {
|
||||
color=orange
|
||||
label=""
|
||||
0 [label="0"]
|
||||
}
|
||||
subgraph cluster_2 {
|
||||
color=orange
|
||||
label=""
|
||||
9 [label="9"]
|
||||
10 [label="10"]
|
||||
}
|
||||
subgraph cluster_3 {
|
||||
color=green
|
||||
label=""
|
||||
8 [label="8"]
|
||||
}
|
||||
subgraph cluster_4 {
|
||||
color=green
|
||||
label=""
|
||||
7 [label="7"]
|
||||
}
|
||||
subgraph cluster_5 {
|
||||
color=black
|
||||
label=""
|
||||
2 [label="2"]
|
||||
}
|
||||
subgraph cluster_6 {
|
||||
color=red
|
||||
label=""
|
||||
4 [label="4"]
|
||||
}
|
||||
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 -> 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
|
||||
|
||||
diff out.dot expected
|
||||
Loading…
Add table
Add a link
Reference in a new issue