scc: get rid of scc_stats

* src/tgbaalgos/scc.cc, src/tgbaalgos/scc.hh: Here.
* src/tgbatest/ltl2tgba.cc: Remove option -k.
* src/tgbatest/sccsimpl.test: Move the only -k test...
* src/tgbatest/scc.test:... here.
This commit is contained in:
Alexandre Duret-Lutz 2015-01-18 21:24:11 +01:00
parent 5b74160abb
commit 731561cdac
5 changed files with 5 additions and 176 deletions

View file

@ -273,8 +273,6 @@ syntax(char* prog)
<< "Output options (if no emptiness check):" << std::endl
<< " -b output the automaton in the format of spot"
<< std::endl
<< " -k display statistics on the automaton (size and SCCs)"
<< std::endl
<< " -ks display statistics on the automaton (size only)"
<< std::endl
<< " -kt display statistics on the automaton (size + "
@ -553,10 +551,6 @@ checked_main(int argc, char** argv)
output = 17;
hoa_opt = argv[formula_index] + 2;
}
else if (!strcmp(argv[formula_index], "-k"))
{
output = 9;
}
else if (!strcmp(argv[formula_index], "-ks"))
{
output = 12;
@ -1608,10 +1602,6 @@ checked_main(int argc, char** argv)
}
break;
}
case 9:
stats_reachable(a).dump(std::cout);
build_scc_stats(a).dump(std::cout);
break;
case 10:
{
auto aa =

View file

@ -27,6 +27,7 @@ cat >formulas<<EOF
b U a,3,2,2
0,0,1,1
(Gb | F!a) W GFc,22,6,5
(!a & G(Ga | F(!a & b))) | (a & F(F!a & G(a | !b))),16,7,6
EOF
run 0 ../../bin/ltl2tgba --low --any --stats='%f,%e,%s,%c' -F formulas/1 >out

View file

@ -171,18 +171,3 @@ test `grep '^acc' out8.txt | wc -w` = 4
run 0 ../ltl2tgba -R3 -s -RDS -ks \
'(G(!((b) R (a)))) R (((c) R (!(d))) U (G((a) | (!(G(e))))))' > out9.txt
grep 'states: 6$' out9.txt
# From Spot 1.1 to 1.1.2, this failed with a BDD error because of
# a bug in scc_filter().
run 0 ../ltl2tgba -R3 -k '(a) <-> F(Ga <-> F!(b -> a))' >stdout
cat >expected <<EOF
transitions: 21
states: 8
total SCCs: 6
accepting SCCs: 3
dead SCCs: 0
accepting paths: 4
dead paths: 0
EOF
diff stdout expected