This is a huge patch, that took over a month to complete. The bit sets are currently restricted to what 'unsigned can store', but it should be easy to extend it to 'uint64_t' should we need it. * NEWS: Update. * src/tgba/acc.hh: New file. * src/tgbatest/acc.cc, src/tgbatest/acc.test: Test it. * src/tgba/tgbakvcomplement.cc, src/tgba/tgbakvcomplement.hh, src/tgba/tgbasgba.cc, src/tgba/tgbasgba.hh: Delete. The KV complementation is too slow to be used in practice, and I somehow broke it during the conversion to bitsets. The tgba->sgba conversion was only used for the KV complementation, and should be better redone on tgba_digraph_ptr should it be needed again. * src/bin/ltlcross.cc, src/dstarparse/dra2ba.cc, src/dstarparse/nsa2tgba.cc, src/graphtest/tgbagraph.cc, src/graphtest/tgbagraph.test, src/kripke/fairkripke.cc, src/kripke/fairkripke.hh, src/kripke/kripke.cc, src/kripke/kripke.hh, src/kripke/kripkeexplicit.cc, src/kripke/kripkeexplicit.hh, src/misc/hash.hh, src/neverparse/neverclaimparse.yy, src/priv/accmap.hh, src/ta/ta.cc, src/ta/ta.hh, src/ta/taexplicit.cc, src/ta/taexplicit.hh, src/ta/taproduct.cc, src/ta/taproduct.hh, src/ta/tgta.cc, src/ta/tgta.hh, src/ta/tgtaexplicit.cc, src/ta/tgtaexplicit.hh, src/ta/tgtaproduct.cc, src/ta/tgtaproduct.hh, src/taalgos/dotty.cc, src/taalgos/emptinessta.cc, src/taalgos/minimize.cc, src/taalgos/tgba2ta.cc, src/tgba/Makefile.am, src/tgba/fwd.hh, src/tgba/taatgba.cc, src/tgba/taatgba.hh, src/tgba/tgba.cc, src/tgba/tgba.hh, src/tgba/tgbagraph.cc, src/tgba/tgbagraph.hh, src/tgba/tgbamask.cc, src/tgba/tgbamask.hh, src/tgba/tgbaproduct.cc, src/tgba/tgbaproduct.hh, src/tgba/tgbaproxy.cc, src/tgba/tgbaproxy.hh, src/tgba/tgbasafracomplement.cc, src/tgba/tgbasafracomplement.hh, src/tgbaalgos/bfssteps.cc, src/tgbaalgos/complete.cc, src/tgbaalgos/compsusp.cc, src/tgbaalgos/degen.cc, src/tgbaalgos/dotty.cc, src/tgbaalgos/dtbasat.cc, src/tgbaalgos/dtgbacomp.cc, src/tgbaalgos/dtgbasat.cc, src/tgbaalgos/dupexp.cc, src/tgbaalgos/emptiness.cc, src/tgbaalgos/emptiness.hh, src/tgbaalgos/gtec/ce.cc, src/tgbaalgos/gtec/gtec.cc, src/tgbaalgos/gtec/gtec.hh, src/tgbaalgos/gtec/sccstack.cc, src/tgbaalgos/gtec/sccstack.hh, src/tgbaalgos/gv04.cc, src/tgbaalgos/hoaf.cc, src/tgbaalgos/isweakscc.cc, src/tgbaalgos/lbtt.cc, src/tgbaalgos/ltl2tgba_fm.cc, src/tgbaalgos/magic.cc, src/tgbaalgos/ndfs_result.hxx, src/tgbaalgos/neverclaim.cc, src/tgbaalgos/postproc.cc, src/tgbaalgos/powerset.cc, src/tgbaalgos/randomgraph.cc, src/tgbaalgos/randomgraph.hh, src/tgbaalgos/reducerun.cc, src/tgbaalgos/replayrun.cc, src/tgbaalgos/safety.cc, src/tgbaalgos/save.cc, src/tgbaalgos/scc.cc, src/tgbaalgos/scc.hh, src/tgbaalgos/sccfilter.cc, src/tgbaalgos/sccinfo.cc, src/tgbaalgos/sccinfo.hh, src/tgbaalgos/se05.cc, src/tgbaalgos/simulation.cc, src/tgbaalgos/simulation.hh, src/tgbaalgos/stats.cc, src/tgbaalgos/stripacc.cc, src/tgbaalgos/tau03.cc, src/tgbaalgos/tau03opt.cc, src/tgbaalgos/weight.cc, src/tgbaalgos/weight.hh, src/tgbaparse/tgbaparse.yy, src/tgbatest/Makefile.am, src/tgbatest/complementation.cc, src/tgbatest/complementation.test, src/tgbatest/degenlskip.test, src/tgbatest/det.test, src/tgbatest/dstar.test, src/tgbatest/emptchk.cc, src/tgbatest/explpro2.test, src/tgbatest/explpro3.test, src/tgbatest/explpro4.test, src/tgbatest/explprod.test, src/tgbatest/ltl2tgba.cc, src/tgbatest/ltl2tgba.test, src/tgbatest/maskacc.cc, src/tgbatest/maskacc.test, src/tgbatest/neverclaimread.test, src/tgbatest/randtgba.cc, src/tgbatest/readsave.test, src/tgbatest/sim.test, src/tgbatest/sim2.test, src/tgbatest/spotlbtt.test, src/tgbatest/tgbaread.test, src/tgbatest/tripprod.test, iface/dve2/dve2.cc: Adjust or use to the new acceptance interface.
269 lines
4.8 KiB
Bash
Executable file
269 lines
4.8 KiB
Bash
Executable file
#!/bin/sh
|
|
# -*- coding: utf-8 -*-
|
|
# Copyright (C) 2013, 2014 Laboratoire de Recherche et
|
|
# Développement de l'Epita (LRDE).
|
|
#
|
|
# 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/>.
|
|
|
|
# Do some quick translations to make sure the neverclaims produced by
|
|
# spot actually look correct! We do that by parsing them via ltlcross.
|
|
# ltl2neverclaim-lbtt.test does the same with LBTT if it is installed.
|
|
|
|
. ./defs
|
|
set -e
|
|
|
|
|
|
# DRA generated with
|
|
# ltlfilt -f 'a U b' -l | ltl2dstar --ltl2nba=spin:path/ltl2tgba@-s - -
|
|
cat >dra.dstar <<EOF
|
|
DRA v2 explicit
|
|
Comment: "Safra[NBA=2]"
|
|
States: 3
|
|
Acceptance-Pairs: 1
|
|
Start: 0
|
|
AP: 2 "a" "b"
|
|
---
|
|
State: 0
|
|
Acc-Sig:
|
|
1
|
|
0
|
|
2
|
|
2
|
|
State: 1
|
|
Acc-Sig: -0
|
|
1
|
|
1
|
|
1
|
|
1
|
|
State: 2
|
|
Acc-Sig: +0
|
|
2
|
|
2
|
|
2
|
|
2
|
|
EOF
|
|
|
|
run 0 ../ltl2tgba -XD dra.dstar | tee stdout
|
|
|
|
cat >expected <<EOF
|
|
digraph G {
|
|
0 [label="", style=invis, height=0]
|
|
0 -> 1
|
|
1 [label="0"]
|
|
1 -> 1 [label="a & !b"]
|
|
1 -> 2 [label="!a & !b"]
|
|
1 -> 3 [label="b"]
|
|
2 [label="1"]
|
|
2 -> 2 [label="1"]
|
|
3 [label="2"]
|
|
3 -> 3 [label="1"]
|
|
}
|
|
EOF
|
|
|
|
diff expected stdout
|
|
|
|
|
|
run 0 ../ltl2tgba -XDD dra.dstar | tee stdout
|
|
|
|
cat >expected <<EOF
|
|
digraph G {
|
|
0 [label="", style=invis, height=0]
|
|
0 -> 1
|
|
1 [label="0"]
|
|
1 -> 1 [label="a & !b"]
|
|
1 -> 2 [label="b"]
|
|
2 [label="1", peripheries=2]
|
|
2 -> 2 [label="1\n{0}"]
|
|
}
|
|
EOF
|
|
|
|
diff expected stdout
|
|
|
|
|
|
|
|
# DSA generated with
|
|
# ltlfilt -f 'FGa' -l |
|
|
# ltl2dstar --automata=streett --ltl2nba=spin:path/ltl2tgba@-s - -
|
|
cat >dsa.dstar <<EOF
|
|
DSA v2 explicit
|
|
Comment: "Streett{Safra[NBA=2]}"
|
|
States: 3
|
|
Acceptance-Pairs: 1
|
|
Start: 1
|
|
AP: 1 "a"
|
|
---
|
|
State: 0
|
|
Acc-Sig: +0
|
|
0
|
|
2
|
|
State: 1
|
|
Acc-Sig:
|
|
0
|
|
0
|
|
State: 2
|
|
Acc-Sig:
|
|
0
|
|
2
|
|
EOF
|
|
|
|
run 0 ../ltl2tgba -XDB dsa.dstar | tee stdout
|
|
|
|
cat >expected <<EOF
|
|
digraph G {
|
|
0 [label="", style=invis, height=0]
|
|
0 -> 1
|
|
1 [label="0"]
|
|
1 -> 2 [label="1"]
|
|
1 -> 3 [label="1"]
|
|
2 [label="1"]
|
|
2 -> 2 [label="!a"]
|
|
2 -> 3 [label="!a"]
|
|
2 -> 4 [label="a"]
|
|
2 -> 5 [label="a"]
|
|
3 [label="2"]
|
|
3 -> 6 [label="!a"]
|
|
3 -> 5 [label="a\n{0}"]
|
|
4 [label="3"]
|
|
4 -> 2 [label="!a"]
|
|
4 -> 3 [label="!a"]
|
|
4 -> 4 [label="a"]
|
|
4 -> 5 [label="a"]
|
|
5 [label="4"]
|
|
5 -> 6 [label="!a"]
|
|
5 -> 5 [label="a\n{0}"]
|
|
6 [label="5"]
|
|
6 -> 6 [label="!a"]
|
|
6 -> 7 [label="a"]
|
|
7 [label="6"]
|
|
7 -> 6 [label="!a"]
|
|
7 -> 7 [label="a"]
|
|
}
|
|
EOF
|
|
|
|
diff expected stdout
|
|
|
|
test "`../../bin/dstar2tgba -D dsa.dstar --stats '%s %t %p %d'`" = "2 5 0 0"
|
|
test "`../../bin/dstar2tgba -DC dsa.dstar --stats '%s %t %p %d'`" = "3 8 1 0"
|
|
|
|
|
|
|
|
# DRA generated with
|
|
# ltlfilt -f 'Ga | Fb' -l | ltl2dstar --ltl2nba=spin:path/ltl2tgba@-sD - -
|
|
# (State name and comments added by hand to test the parser.)
|
|
cat >dra.dstar <<EOF
|
|
DRA v2 explicit
|
|
Comment: "Union{Safra[NBA=1],Safra[NBA=2]}"
|
|
States: 5
|
|
Acceptance-Pairs: 2
|
|
Start: 0
|
|
AP: 2 "a" "b"
|
|
---
|
|
State: 0 "bla"
|
|
Acc-Sig:
|
|
1
|
|
2 /* This is a comment */
|
|
3
|
|
4
|
|
State: 1 "foo"
|
|
Acc-Sig: -0
|
|
1
|
|
1 // This is another comment.
|
|
3
|
|
3
|
|
State: 2 "baz"
|
|
Acc-Sig: +0
|
|
1
|
|
2
|
|
// more
|
|
/// comment
|
|
3
|
|
4
|
|
State: 3 "str\n\"ing"
|
|
Acc-Sig: -0 +1
|
|
3 /***
|
|
**** Some multiline comment
|
|
***/
|
|
3
|
|
3
|
|
3
|
|
State: 4 "more\"string\""
|
|
Acc-Sig: +0 +1
|
|
3
|
|
4
|
|
3
|
|
4
|
|
EOF
|
|
|
|
run 0 ../ltl2tgba -XDD dra.dstar | tee stdout
|
|
|
|
cat >expected <<EOF
|
|
digraph G {
|
|
0 [label="", style=invis, height=0]
|
|
0 -> 1
|
|
1 [label="0"]
|
|
1 -> 2 [label="!a & !b"]
|
|
1 -> 3 [label="a & !b"]
|
|
1 -> 4 [label="!a & b"]
|
|
1 -> 5 [label="a & b"]
|
|
2 [label="1"]
|
|
2 -> 2 [label="!b"]
|
|
2 -> 4 [label="b"]
|
|
3 [label="2", peripheries=2]
|
|
3 -> 2 [label="!a & !b\n{0}"]
|
|
3 -> 3 [label="a & !b\n{0}"]
|
|
3 -> 4 [label="!a & b\n{0}"]
|
|
3 -> 5 [label="a & b\n{0}"]
|
|
4 [label="3", peripheries=2]
|
|
4 -> 4 [label="1\n{0}"]
|
|
5 [label="4", peripheries=2]
|
|
5 -> 4 [label="!a\n{0}"]
|
|
5 -> 5 [label="a\n{0}"]
|
|
}
|
|
EOF
|
|
|
|
diff expected stdout
|
|
|
|
test "`../../bin/dstar2tgba -D dra.dstar --stats '%s %t %p %d'`" = "3 12 1 1"
|
|
|
|
# This has caused a crash at some point when dealing with 0-sized
|
|
# bitsets to represent acceptance sets.
|
|
cat >aut.dsa <<EOF
|
|
DSA v2 explicit
|
|
Comment: "Streett{Safra[NBA=1]}"
|
|
States: 1
|
|
Acceptance-Pairs: 0
|
|
Start: 0
|
|
AP: 0
|
|
---
|
|
State: 0
|
|
Acc-Sig:
|
|
0
|
|
EOF
|
|
run 0 ../ltl2tgba -XDD aut.dsa | tee stdout
|
|
|
|
cat >expected<<EOF
|
|
digraph G {
|
|
0 [label="", style=invis, height=0]
|
|
0 -> 1
|
|
1 [label="0"]
|
|
1 -> 1 [label="1"]
|
|
1 -> 2 [label="1"]
|
|
2 [label="1"]
|
|
2 -> 2 [label="1"]
|
|
}
|
|
EOF
|
|
|
|
diff expected stdout
|