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

* src/tgbaalgos/emptinesscheck.hh (emptiness_check::emptiness_check):

Browse source 
New, take the automaton to work on, and store it ...
(emptiness_check::aut_): ... in this new attribute.
(emptiness_check::tgba_emptiness_check): Rename as ...
(emptiness_check::check): ... this, and remove the automata
argument.
(emptiness_check::counter_example, emptiness_check::print_result,
emptiness_check::remove_component, emptiness_check::accepting_path,
emptiness_check::complete_cycle): Remove the automata argument.
* src/tgbaalgos/emptinesscheck.cc, src/tgbatest/ltl2tgba.cc,
iface/gspn/ltlgspn.cc: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2003-10-23 14:17:02 +00:00
parent b60722bc58
commit 90099e47a6
6 changed files with 101 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,5 +1,17 @@
2003-10-23 Alexandre Duret-Lutz <adl@src.lip6.fr> 2003-10-23 Alexandre Duret-Lutz <adl@src.lip6.fr>
* src/tgbaalgos/emptinesscheck.hh (emptiness_check::emptiness_check):
New, take the automaton to work on, and store it ...
(emptiness_check::aut_): ... in this new attribute.
(emptiness_check::tgba_emptiness_check): Rename as ...
(emptiness_check::check): ... this, and remove the automata
argument.
(emptiness_check::counter_example, emptiness_check::print_result,
emptiness_check::remove_component, emptiness_check::accepting_path,
emptiness_check::complete_cycle): Remove the automata argument.
* src/tgbaalgos/emptinesscheck.cc, src/tgbatest/ltl2tgba.cc,
iface/gspn/ltlgspn.cc: Adjust.
* src/tgbaalgos/emptinesscheck.hh (connected_component::not_null, * src/tgbaalgos/emptinesscheck.hh (connected_component::not_null,
connected_component::transition_acc, connected_component::transition_acc,
connected_component::nb_transition, connected_component::nb_transition,

8
iface/gspn/ltlgspn.cc
View file

@ -107,14 +107,14 @@ main(int argc, char **argv)
{ {
case Couvreur: case Couvreur:
{ {
spot::emptiness_check ec; spot::emptiness_check ec(prod);
bool res = ec.tgba_emptiness_check(prod); bool res = ec.check();
if (!res) if (!res)
{ {
if (compute_counter_example) if (compute_counter_example)
{ {
ec.counter_example(prod); ec.counter_example();
ec.print_result(std::cout, prod, model); ec.print_result(std::cout, model);
} }
else else
{ {

109
src/tgbaalgos/emptinesscheck.cc
View file

@ -27,17 +27,19 @@ namespace spot
condition = bddfalse; condition = bddfalse;
} }
/// \brief Remove all the nodes accessible from the given node start_delete.
/// emptiness_check::emptiness_check(const tgba* a)
/// The removed graph is the subgraph containing nodes stored : aut_(a)
/// in table state_map with order -1.
void
emptiness_check::remove_component(const tgba& aut, seen& state_map,
const spot::state* start_delete)
{ {
std::stack<spot::tgba_succ_iterator*> to_remove; }
void
emptiness_check::remove_component(seen& state_map,
const state* start_delete)
{
std::stack<tgba_succ_iterator*> to_remove;
state_map[start_delete] = -1; state_map[start_delete] = -1;
tgba_succ_iterator* iter_delete = aut.succ_iter(start_delete); tgba_succ_iterator* iter_delete = aut_->succ_iter(start_delete);
iter_delete->first(); iter_delete->first();
to_remove.push(iter_delete); to_remove.push(iter_delete);
while (!to_remove.empty()) while (!to_remove.empty())
@ -52,7 +54,7 @@ namespace spot
if (state_map[curr_state] != -1) if (state_map[curr_state] != -1)
{ {
state_map[curr_state] = -1; state_map[curr_state] = -1;
tgba_succ_iterator* succ_delete2 = aut.succ_iter(curr_state); tgba_succ_iterator* succ_delete2 = aut_->succ_iter(curr_state);
succ_delete2->first(); succ_delete2->first();
to_remove.push(succ_delete2); to_remove.push(succ_delete2);
} }
@ -60,21 +62,17 @@ namespace spot
} }
} }
/// \brief On-the-fly emptiness check.
///
/// The algorithm used here is adapted from Jean-Michel Couvreur's
/// Probataf tool.
bool bool
emptiness_check::tgba_emptiness_check(const spot::tgba* aut_check) emptiness_check::check()
{ {
std::stack<pair_state_iter> todo; std::stack<pair_state_iter> todo;
std::stack<bdd> arc_accepting; std::stack<bdd> arc_accepting;
int nbstate = 1; int nbstate = 1;
state* init = aut_check->get_init_state(); state* init = aut_->get_init_state();
seen_state_num[init] = 1; seen_state_num[init] = 1;
root_component.push(spot::connected_component(1)); root_component.push(connected_component(1));
arc_accepting.push(bddfalse); arc_accepting.push(bddfalse);
tgba_succ_iterator* iter_ = aut_check->succ_iter(init); tgba_succ_iterator* iter_ = aut_->succ_iter(init);
iter_->first(); iter_->first();
todo.push(pair_state_iter(init, iter_ )); todo.push(pair_state_iter(init, iter_ ));
while (!todo.empty()) while (!todo.empty())
@ -90,10 +88,8 @@ namespace spot
assert(i_0 != seen_state_num.end()); assert(i_0 != seen_state_num.end());
if (comp_tmp.index == seen_state_num[step.first]) if (comp_tmp.index == seen_state_num[step.first])
{ {
/// The current node is a root of a Strong Connected Component. // The current node is a root of a Strong Connected Component.
spot::emptiness_check::remove_component(*aut_check, emptiness_check::remove_component(seen_state_num, step.first);
seen_state_num,
step.first);
assert(!arc_accepting.empty()); assert(!arc_accepting.empty());
arc_accepting.pop(); arc_accepting.pop();
assert(root_component.size() == arc_accepting.size()); assert(root_component.size() == arc_accepting.size());
@ -119,7 +115,7 @@ namespace spot
seen_state_num[current_state] = nbstate; seen_state_num[current_state] = nbstate;
root_component.push(connected_component(nbstate)); root_component.push(connected_component(nbstate));
arc_accepting.push(current_accepting); arc_accepting.push(current_accepting);
tgba_succ_iterator* iter2 = aut_check->succ_iter(current_state); tgba_succ_iterator* iter2 = aut_->succ_iter(current_state);
iter2->first(); iter2->first();
todo.push(pair_state_iter(current_state, iter2 )); todo.push(pair_state_iter(current_state, iter2 ));
} }
@ -146,7 +142,7 @@ namespace spot
new_condition |= arc_acc; new_condition |= arc_acc;
} }
comp.condition |= new_condition; comp.condition |= new_condition;
if (aut_check->all_accepting_conditions() == comp.condition) if (aut_->all_accepting_conditions() == comp.condition)
{ {
// A failure SCC was found, the automata is not empty. // A failure SCC was found, the automata is not empty.
root_component.push(comp); root_component.push(comp);
@ -163,23 +159,22 @@ namespace spot
std::ostream& std::ostream&
emptiness_check::print_result(std::ostream& os, const spot::tgba* aut, emptiness_check::print_result(std::ostream& os, const tgba* restrict) const
const tgba* restrict) const
{ {
os << "Prefix:" << std::endl; os << "Prefix:" << std::endl;
const bdd_dict* d = aut->get_dict(); const bdd_dict* d = aut_->get_dict();
for (state_sequence::const_iterator i_se = suffix.begin(); for (state_sequence::const_iterator i_se = suffix.begin();
i_se != suffix.end(); ++i_se) i_se != suffix.end(); ++i_se)
{ {
os << " "; os << " ";
if (restrict) if (restrict)
{ {
os << restrict->format_state(aut->project_state(*i_se, restrict)) os << restrict->format_state(aut_->project_state(*i_se, restrict))
<< std::endl; << std::endl;
} }
else else
{ {
os << aut->format_state((*i_se)) << std::endl; os << aut_->format_state((*i_se)) << std::endl;
} }
} }
os << "Cycle:" <<std::endl; os << "Cycle:" <<std::endl;
@ -190,26 +185,25 @@ namespace spot
if (restrict) if (restrict)
{ {
os << " | " << bdd_format_set(d, it->second) <<std::endl ; os << " | " << bdd_format_set(d, it->second) <<std::endl ;
os << restrict->format_state(aut->project_state(it->first, os << restrict->format_state(aut_->project_state(it->first,
restrict)) restrict))
<< std::endl; << std::endl;
} }
else else
{ {
os << " | " << bdd_format_set(d, it->second) <<std::endl ; os << " | " << bdd_format_set(d, it->second) <<std::endl ;
os << aut->format_state(it->first) << std::endl; os << aut_->format_state(it->first) << std::endl;
} }
} }
return os; return os;
} }
/// \brief Build a possible prefix and period for a counter example.
void void
emptiness_check::counter_example(const spot::tgba* aut_counter) emptiness_check::counter_example()
{ {
std::deque <pair_state_iter> todo_trace; std::deque <pair_state_iter> todo_trace;
typedef std::map<const spot::state*, const spot::state*, typedef std::map<const state*, const state*,
spot::state_ptr_less_than> path_state; state_ptr_less_than> path_state;
path_state path_map; path_state path_map;
assert(!root_component.empty()); assert(!root_component.empty());
@ -250,10 +244,10 @@ namespace spot
} }
} }
state* start_state = aut_counter->get_init_state(); state* start_state = aut_->get_init_state();
if (comp_size != 1) if (comp_size != 1)
{ {
tgba_succ_iterator* i = aut_counter->succ_iter(start_state); tgba_succ_iterator* i = aut_->succ_iter(start_state);
todo_trace.push_back(pair_state_iter(start_state, i)); todo_trace.push_back(pair_state_iter(start_state, i));
for (int k = 0; k < comp_size - 1; ++k) for (int k = 0; k < comp_size - 1; ++k)
@ -314,7 +308,7 @@ namespace spot
{ {
todo_trace. todo_trace.
push_back(pair_state_iter(curr_state, push_back(pair_state_iter(curr_state,
aut_counter->succ_iter(curr_state))); aut_->succ_iter(curr_state)));
path_map[curr_state] = started_from.first; path_map[curr_state] = started_from.first;
} }
} }
@ -323,7 +317,7 @@ namespace spot
} }
todo_trace. todo_trace.
push_back(pair_state_iter(vec_sequence[k].back(), push_back(pair_state_iter(vec_sequence[k].back(),
aut_counter->succ_iter(vec_sequence[k].back()))); aut_->succ_iter(vec_sequence[k].back())));
} }
} }
else else
@ -335,25 +329,21 @@ namespace spot
it != vec_sequence[n_].end(); ++it) it != vec_sequence[n_].end(); ++it)
suffix.push_back(*it); suffix.push_back(*it);
suffix.unique(); suffix.unique();
emptiness_check::accepting_path(aut_counter, accepting_path(vec_component[comp_size - 1], suffix.back(),
vec_component[comp_size - 1],
suffix.back(),
vec_component[comp_size - 1].condition); vec_component[comp_size - 1].condition);
} }
/// \brief complete the path build by accepting_path to get the period.
void void
emptiness_check::complete_cycle(const spot::tgba* aut_counter, emptiness_check::complete_cycle(const connected_component& comp_path,
const connected_component& comp_path,
const state* from_state, const state* from_state,
const state* to_state) const state* to_state)
{ {
if (seen_state_num[from_state] != seen_state_num[to_state]) if (seen_state_num[from_state] != seen_state_num[to_state])
{ {
std::map<const spot::state*, state_proposition, std::map<const state*, state_proposition,
spot::state_ptr_less_than> complete_map; state_ptr_less_than> complete_map;
std::deque<pair_state_iter> todo_complete; std::deque<pair_state_iter> todo_complete;
spot::tgba_succ_iterator* ite = aut_counter->succ_iter(from_state); tgba_succ_iterator* ite = aut_->succ_iter(from_state);
todo_complete.push_back(pair_state_iter(from_state, ite)); todo_complete.push_back(pair_state_iter(from_state, ite));
cycle_path tmp_comp; cycle_path tmp_comp;
while(!todo_complete.empty()) while(!todo_complete.empty())
@ -388,7 +378,7 @@ namespace spot
else else
{ {
todo_complete.push_back(pair_state_iter(curr_state, todo_complete.push_back(pair_state_iter(curr_state,
aut_counter->succ_iter(curr_state))); aut_->succ_iter(curr_state)));
complete_map[curr_state] = complete_map[curr_state] =
state_proposition(started_.first, state_proposition(started_.first,
iter_s->current_condition()); iter_s->current_condition());
@ -399,17 +389,14 @@ namespace spot
} }
} }
/// \Brief build recursively a path in the accepting SCC to get // FIXME: Derecursive this function.
/// all accepting conditions. This path is the first part of the
/// period.
void void
emptiness_check::accepting_path(const spot::tgba* aut_counter, emptiness_check::accepting_path(const connected_component& comp_path,
const connected_component& comp_path, const state* start_path, bdd to_accept)
const spot::state* start_path, bdd to_accept)
{ {
seen seen_priority; seen seen_priority;
std::stack<triplet> todo_path; std::stack<triplet> todo_path;
tgba_succ_iterator* t_s_i = aut_counter->succ_iter(start_path); tgba_succ_iterator* t_s_i = aut_->succ_iter(start_path);
t_s_i->first(); t_s_i->first();
todo_path.push(triplet(pair_state_iter(start_path, t_s_i), bddfalse)); todo_path.push(triplet(pair_state_iter(start_path, t_s_i), bddfalse));
bdd tmp_acc = bddfalse; bdd tmp_acc = bddfalse;
@ -438,8 +425,7 @@ namespace spot
seen::iterator i = seen_priority.find(curr_state); seen::iterator i = seen_priority.find(curr_state);
if (i == seen_priority.end()) if (i == seen_priority.end())
{ {
tgba_succ_iterator* c_iter = tgba_succ_iterator* c_iter = aut_->succ_iter(curr_state);
aut_counter->succ_iter(curr_state);
bdd curr_bdd = bdd curr_bdd =
iter_->current_accepting_conditions() | step_.second; iter_->current_accepting_conditions() | step_.second;
c_iter->first(); c_iter->first();
@ -501,8 +487,8 @@ namespace spot
if (best_acc != to_accept) if (best_acc != to_accept)
{ {
bdd rec_to_acc = to_accept - best_acc; bdd rec_to_acc = to_accept - best_acc;
emptiness_check::accepting_path(aut_counter, comp_path, emptiness_check::accepting_path(comp_path, period.back().first,
period.back().first, rec_to_acc); rec_to_acc);
} }
else else
{ {
@ -510,8 +496,7 @@ namespace spot
{ {
/// The path contains all accepting conditions. Then we /// The path contains all accepting conditions. Then we
///complete the cycle in this SCC by calling complete_cycle. ///complete the cycle in this SCC by calling complete_cycle.
complete_cycle(aut_counter, comp_path, period.back().first, complete_cycle(comp_path, period.back().first, suffix.back());
suffix.back());
} }
} }
} }

40
src/tgbaalgos/emptinesscheck.hh
View file

@ -35,16 +35,7 @@ namespace spot
set_of_state state_set; set_of_state state_set;
}; };
class emptiness_check /// \brief Check whether the language of an automate is empty.
{
typedef std::map<const spot::state*, int, spot::state_ptr_less_than> seen;
typedef std::list<const state*> state_sequence;
typedef std::pair<const spot::state*, bdd> state_proposition;
typedef std::list<state_proposition> cycle_path;
public:
/// This function returns true if the automata's language is empty,
/// and builds a stack of SCC.
/// ///
/// This is based on the following paper. /// This is based on the following paper.
/// \verbatim /// \verbatim
@ -64,15 +55,27 @@ namespace spot
/// isbn = {3-540-66587-0} /// isbn = {3-540-66587-0}
/// } /// }
/// \endverbatim /// \endverbatim
bool tgba_emptiness_check(const spot::tgba* aut_check); class emptiness_check
{
typedef std::map<const spot::state*, int, spot::state_ptr_less_than> seen;
typedef std::list<const state*> state_sequence;
typedef std::pair<const spot::state*, bdd> state_proposition;
typedef std::list<state_proposition> cycle_path;
public:
emptiness_check(const tgba* a);
/// This function returns true if the automata's language is empty,
/// and builds a stack of SCC.
bool check();
/// Compute a counter example if tgba_emptiness_check() returned false. /// Compute a counter example if tgba_emptiness_check() returned false.
void counter_example(const spot::tgba* aut_counter); void counter_example();
std::ostream& print_result(std::ostream& os, const spot::tgba* aut, std::ostream& print_result(std::ostream& os,
const tgba* restrict = 0) const; const tgba* restrict = 0) const;
private: private:
const tgba* aut_;
std::stack<connected_component> root_component; std::stack<connected_component> root_component;
seen seen_state_num; seen seen_state_num;
state_sequence suffix; state_sequence suffix;
@ -83,19 +86,16 @@ namespace spot
/// This function remove all accessible state from a given /// This function remove all accessible state from a given
/// state. In other words, it removes the strongly connected /// state. In other words, it removes the strongly connected
/// component that contains this state. /// component that contains this state.
void remove_component(const tgba& aut, seen& state_map, void remove_component(seen& state_map, const state* start_delete);
const spot::state* start_delete);
/// Called by counter_example to find a path which traverses all /// Called by counter_example to find a path which traverses all
/// accepting conditions in the accepted SCC. /// accepting conditions in the accepted SCC.
void accepting_path (const spot::tgba* aut_counter, void accepting_path (const connected_component& comp_path,
const connected_component& comp_path, const state* start_path, bdd to_accept);
const spot::state* start_path, bdd to_accept);
/// Complete a cycle that caraterise the period of the counter /// Complete a cycle that caraterise the period of the counter
/// example. Append a sequence to the path given by accepting_path. /// example. Append a sequence to the path given by accepting_path.
void complete_cycle(const spot::tgba* aut_counter, void complete_cycle(const connected_component& comp_path,
const connected_component& comp_path,
const state* from_state,const state* to_state); const state* from_state,const state* to_state);
}; };
} }

4
src/tgbatest/emptchk.test
View file

@ -38,5 +38,5 @@ expect_no '!((FF a) <=> (F a))'
expect_no 'Xa && (!a U b) && !b && X!b' expect_no 'Xa && (!a U b) && !b && X!b'
expect_no '(a U !b) && Gb' expect_no '(a U !b) && Gb'
# Expect five counter-examples.. # Expect at least four counter-examples.
test `./ltl2tgba -n 'FFx <=> Fx' | grep Prefix: | wc -l` = 5 test `./ltl2tgba -n 'FFx <=> Fx' | grep Prefix: | wc -l` -ge 4

8
src/tgbatest/ltl2tgba.cc
View file

@ -264,8 +264,8 @@ main(int argc, char** argv)
break; break;
case Couvreur: case Couvreur:
{ {
spot::emptiness_check ec = spot::emptiness_check(); spot::emptiness_check ec = spot::emptiness_check(a);
bool res = ec.tgba_emptiness_check(a); bool res = ec.check();
if (expect_counter_example) if (expect_counter_example)
{ {
if (res) if (res)
@ -273,8 +273,8 @@ main(int argc, char** argv)
exit_code = 1; exit_code = 1;
break; break;
} }
ec.counter_example(a); ec.counter_example();
ec.print_result(std::cout, a); ec.print_result(std::cout);
} }
else else
{ {