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

dstarparse: get rid of the deticated data structures and conversions

Browse source 
* src/dstarparse/dstarparse.yy: Use the twa_graph_ptr to store the
acceptance condition.
* src/dstarparse/dra2ba.cc, src/dstarparse/dstar2tgba.cc,
src/dstarparse/nra2nba.cc, src/dstarparse/nsa2tgba.cc: Delete
all these conversion routines.
* src/dstarparse/public.hh, src/dstarparse/Makefile.am: Adjust.
* src/bin/dstar2tgba.cc: Adjust to call to_generalized_buchi()
instead.
* src/bin/ltlcross.cc: Adjust to call remove_fin() instead.
* src/bin/ltldo.cc: Use the parsed automaton as-is.
* src/tests/degenid.test, src/tests/dstar.test, src/tests/ikwiad.cc:
Adjust test cases.
This commit is contained in:
Alexandre Duret-Lutz 2015-08-20 19:50:03 +02:00
parent 5f0b6dc36c
commit 9b5340b90a
13 changed files with 75 additions and 874 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/tests/dstar.test
View file

@ -68,9 +68,9 @@ digraph G {
0 -> 0 [label="a & !b"]
0 -> 1 [label="!a & !b"]
0 -> 2 [label="b"]
1 [label="1"]
1 [label="1\n{0}"]
1 -> 1 [label="1"]
2 [label="2"]
2 [label="2\n{1}"]
2 -> 2 [label="1"]
}
EOF
@ -78,7 +78,7 @@ EOF
diff expected stdout
run 0 ../ikwiad -XDD dra.dstar | tee stdout
run 0 ../ikwiad -XDB -R3 dra.dstar | tee stdout
cat >expected <<EOF
digraph G {
@ -130,39 +130,26 @@ digraph G {
rankdir=LR
node [shape="circle"]
I [label="", style=invis, width=0]
I -> 0
I -> 1
0 [label="0"]
0 -> 1 [label="1"]
0 -> 2 [label="1"]
0 -> 0 [label="!a"]
0 -> 2 [label="a"]
1 [label="1"]
1 -> 1 [label="!a"]
1 -> 2 [label="!a"]
1 -> 3 [label="a"]
1 -> 4 [label="a"]
1 -> 0 [label="1"]
2 [label="2"]
2 -> 5 [label="!a"]
2 -> 4 [label="a\n{0}"]
3 [label="3"]
3 -> 1 [label="!a"]
3 -> 2 [label="!a"]
2 -> 0 [label="!a"]
2 -> 2 [label="a"]
2 -> 3 [label="a"]
3 [label="3", peripheries=2]
3 -> 3 [label="a"]
3 -> 4 [label="a"]
4 [label="4"]
4 -> 5 [label="!a"]
4 -> 4 [label="a\n{0}"]
5 [label="5"]
5 -> 5 [label="!a"]
5 -> 6 [label="a"]
6 [label="6"]
6 -> 5 [label="!a"]
6 -> 6 [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"
# These one could be reduced to 2 5 0 0 and 3 8 1 0
test "`../../bin/dstar2tgba -D dsa.dstar --stats '%s %t %p %d'`" = "4 8 0 0"
test "`../../bin/dstar2tgba -DC dsa.dstar --stats '%s %t %p %d'`" = "5 11 1 0"
@ -213,7 +200,7 @@ Acc-Sig: +0 +1
4
EOF
run 0 ../ikwiad -XDD dra.dstar | tee stdout
run 0 ../ikwiad -XDB dra.dstar | tee stdout
cat >expected <<EOF
digraph G {
@ -272,7 +259,7 @@ digraph G {
I [label="", style=invis, width=0]
I -> 0
0 [label="0"]
0 -> 0 [label="1"]
0 -> 0 [label="1\n{0}"]
}
EOF