Commit 30727074 authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

Add a way to count the number of sub-transitions.

* src/tgbaalgos/stats.hh (tgba_sub_statistics): New class.
(sub_stats_reachable): New function.
* src/tgbaalgos/stats.cc (sub_stats_bfs): New class.
(tgba_sub_statistics::dump, sub_stats_reachable): New function.
* src/tgbatest/ltl2tgba.cc (-kt): New option.
* src/tgbatest/ltl2tgba.test: Use -kt.
parent 91e51c4c
2011-02-04 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Add a way to count the number of sub-transitions.
* src/tgbaalgos/stats.hh (tgba_sub_statistics): New class.
(sub_stats_reachable): New function.
* src/tgbaalgos/stats.cc (sub_stats_bfs): New class.
(tgba_sub_statistics::dump, sub_stats_reachable): New function.
* src/tgbatest/ltl2tgba.cc (-kt): New option.
* src/tgbatest/ltl2tgba.test: Use -kt.
2011-02-03 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Read guard of the form !(x) in neverclaims.
......
// Copyright (C) 2008 Laboratoire de Recherche et Développement
// Copyright (C) 2008, 2011 Laboratoire de Recherche et Dveloppement
// de l'Epita (LRDE).
// Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// dpartement Systmes Rpartis Coopratifs (SRC), Universit Pierre
......@@ -54,6 +54,49 @@ namespace spot
private:
tgba_statistics& s_;
};
class sub_stats_bfs: public stats_bfs
{
public:
sub_stats_bfs(const tgba* a, tgba_sub_statistics& s)
: stats_bfs(a, s), s_(s), seen_(bddtrue)
{
}
void
process_link(const state*, int, const state*, int,
const tgba_succ_iterator* it)
{
++s_.transitions;
bdd cond = it->current_condition();
bdd newvars = bdd_exist(bdd_support(cond), seen_);
if (newvars != bddtrue)
{
seen_ &= newvars;
int count = 0;
while (newvars != bddtrue)
{
++count;
newvars = bdd_high(newvars);
}
// If we discover one new variable, that means that all
// transitions we counted so far are actually double
// subtransitions. If we have two new variables, they where
// quadruple transitions, etc.
s_.sub_transitions <<= count;
}
while (cond != bddfalse)
{
cond -= bdd_satoneset(cond, seen_, bddtrue);
++s_.sub_transitions;
}
}
private:
tgba_sub_statistics& s_;
bdd seen_;
};
} // anonymous
......@@ -64,12 +107,28 @@ namespace spot
return out;
}
std::ostream& tgba_sub_statistics::dump(std::ostream& out) const
{
out << "sub trans.: " << sub_transitions << std::endl;
this->tgba_statistics::dump(out);
return out;
}
tgba_statistics
stats_reachable(const tgba* g)
{
tgba_statistics s = {0, 0};
tgba_statistics s;
stats_bfs d(g, s);
d.run();
return s;
}
tgba_sub_statistics
sub_stats_reachable(const tgba* g)
{
tgba_sub_statistics s;
sub_stats_bfs d(g, s);
d.run();
return s;
}
}
// Copyright (C) 2008 Laboratoire de Recherche et Développement
// Copyright (C) 2008, 2011 Laboratoire de Recherche et Dveloppement
// de l'Epita (LRDE).
// Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// dpartement Systmes Rpartis Coopratifs (SRC), Universit Pierre
......@@ -38,11 +38,22 @@ namespace spot
unsigned transitions;
unsigned states;
tgba_statistics() { transitions = 0; states = 0; }
std::ostream& dump(std::ostream& out) const;
};
struct tgba_sub_statistics: public tgba_statistics
{
unsigned sub_transitions;
tgba_sub_statistics() { sub_transitions = 0; }
std::ostream& dump(std::ostream& out) const;
};
/// \brief Compute statistics for an automaton.
tgba_statistics stats_reachable(const tgba* g);
/// \brief Compute subended statistics for an automaton.
tgba_sub_statistics sub_stats_reachable(const tgba* g);
/// @}
}
......
......@@ -259,6 +259,9 @@ syntax(char* prog)
<< std::endl
<< " -ks display statistics on the automaton (size only)"
<< std::endl
<< " -kt display statistics on the automaton (size + "
<< "subtransitions)"
<< std::endl
<< " -K dump the graph of SCCs in dot format" << std::endl
<< " -KV verbosely dump the graph of SCCs in dot format"
<< std::endl
......@@ -486,6 +489,10 @@ main(int argc, char** argv)
{
output = 12;
}
else if (!strcmp(argv[formula_index], "-kt"))
{
output = 13;
}
else if (!strcmp(argv[formula_index], "-K"))
{
output = 10;
......@@ -534,7 +541,7 @@ main(int argc, char** argv)
}
else if (!strcmp(argv[formula_index], "-O"))
{
output = 13;
output = 14;
opt_minimize = true;
}
else if (!strcmp(argv[formula_index], "-p"))
......@@ -1146,6 +1153,9 @@ main(int argc, char** argv)
stats_reachable(a).dump(std::cout);
break;
case 13:
sub_stats_reachable(a).dump(std::cout);
break;
case 14:
if (minimized == 0)
{
std::cout << "this is not an obligation property";
......
......@@ -63,7 +63,8 @@ done
# Make sure '!(Ga U b)' has 3 states and 6 transitions,
# before and after degeneralization.
for opt in '' -D -DS; do
../ltl2tgba -ks -f -R3 $opt '!(Ga U b)' > stdout
../ltl2tgba -kt -f -R3 $opt '!(Ga U b)' > stdout
grep 'sub trans.: 11$' stdout
grep 'transitions: 6$' stdout
grep 'states: 3$' stdout
done
......@@ -71,7 +72,8 @@ done
# Make sure 'Ga U b' has 4 states and 6 transitions,
# before and after degeneralization.
for opt in '' -D -DS; do
../ltl2tgba -ks -f -R3 $opt 'Ga U b' > stdout
../ltl2tgba -kt -f -R3 $opt 'Ga U b' > stdout
grep 'sub trans.: 12$' stdout
grep 'transitions: 6$' stdout
grep 'states: 4$' stdout
done
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment