dtgbacomp: Rewrite using tgba_digraph instead of tgba_explicit_number

* src/tgbaalgos/dtgbacomp.cc, src/tgbaalgos/dtgbacomp.hh: Rewrite.
Also prefer simple loops over reachiter.
* src/tgbatest/det.test: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2014-08-10 17:59:34 +02:00
parent 0909c2fe3d
commit ead04cb1ac
3 changed files with 99 additions and 140 deletions

View file

@ -1,6 +1,6 @@
#!/bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2013 Laboratoire de Recherche et Développement
# Copyright (C) 2013, 2014 Laboratoire de Recherche et Développement
# de l'Epita (LRDE).
#
# This file is part of Spot, a model checking library.
@ -72,21 +72,22 @@ EOF
# FIXME: we should improve this output
cat >ex.tgba <<'EOF'
acc = "1";
"0", "1", "a",;
"0", "0", "!a",;
"0", "3", "!a",;
"1", "2", "a",;
"1", "1", "!a",;
"1", "-1", "!a",;
"2", "3", "a",;
"2", "1", "!a",;
"2", "-1", "!a",;
"-1", "-1", "!a", "1";
"3", "3", "a",;
"3", "-3", "a",;
"3", "1", "!a",;
"3", "-1", "!a",;
"-3", "-3", "a", "1";
"-3", "-1", "!a", "1";
"1", "0", "!a",;
"1", "3", "!a",;
"3", "3", "!a", "1";
"2", "2", "a",;
"2", "0", "!a",;
"2", "5", "a",;
"2", "3", "!a",;
"5", "5", "a", "1";
"5", "3", "!a", "1";
EOF
run 0 ../ltl2tgba -b -DC -X in.tgba > out.tgba
diff out.tgba ex.tgba
@ -96,15 +97,15 @@ cat >ex.tgba <<EOF
digraph G {
0 [label="", style=invis, height=0]
0 -> 1
1 [label="1"]
1 [label="0"]
1 -> 2 [label="1\n"]
2 [label="2"]
2 [label="1"]
2 -> 2 [label="1\n"]
2 -> 3 [label="!a\n"]
2 -> 4 [label="!b\n"]
3 [label="-4"]
3 [label="3"]
3 -> 3 [label="!a\n{Acc[1]}"]
4 [label="-3"]
4 [label="5"]
4 -> 4 [label="!b\n{Acc[1]}"]
}
EOF