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

Running ltl2tgba -R1q -R1t -N would degeneralize before and

Browse source 
after the simulation-reduction.

Report from Tomáš Babiak <xbabiak@fi.muni.cz>.

* src/tgbaalgos/neverclaim.hh (never_claim_reachable): Take
a tgba as input.
* src/tgbaalgos/neverclaim.cc (never_claim_bfs): Call
state_is_accepting() only if this tgba turns out to be
a tgba_sba_proxy.  Otherwise check the acceptance of one
outgoing transition as we do in dotty_bfs since 2011-03-05.
* src/tgbatest/ltl2tgba.cc: Do not redegeneralize before
calling never_claim_reachable() if we know the automaton is
degeneralized already.
* src/tgbatest/ltl2tgba.test: Add a test case.
This commit is contained in:
Alexandre Duret-Lutz 2011-08-25 16:53:40 +02:00
parent 1c2450f609
commit d8ba172e6d
5 changed files with 61 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/tgbaalgos/neverclaim.cc
View file

@ -38,11 +38,12 @@ namespace spot
class never_claim_bfs : public tgba_reachable_iterator_breadth_first
{
public:
never_claim_bfs(const tgba_sba_proxy* a, std::ostream& os,
never_claim_bfs(const tgba* a, std::ostream& os,
const ltl::formula* f, bool comments)
: tgba_reachable_iterator_breadth_first(a),
os_(os), f_(f), accept_all_(-1), fi_needed_(false),
comments_(comments)
comments_(comments), all_acc_conds_(a->all_acceptance_conditions()),
degen_(dynamic_cast<const tgba_sba_proxy*>(a))
{
}
@ -77,8 +78,23 @@ namespace spot
bool
state_is_accepting(const state *s)
{
return
dynamic_cast<const tgba_sba_proxy*>(automata_)->state_is_accepting(s);
// If the automaton is degeneralized on-the-fly,
// it's easier to just query the state_is_accepting() method.
if (degen_)
return degen_->state_is_accepting(s);
// Otherwise, since we are dealing with a degeneralized
// automaton nonetheless, the transitions leaving an accepting
// state are either all accepting, or all non-accepting. So
// we just check the acceptance of the first transition. This
// is not terribly efficient since we have to create the
// iterator.
tgba_succ_iterator* it = automata_->succ_iter(s);
it->first();
bool accepting =
!it->done() && it->current_acceptance_conditions() == all_acc_conds_;
delete it;
return accepting;
}
std::string
@ -185,13 +201,16 @@ namespace spot
bool fi_needed_;
state* init_;
bool comments_;
bdd all_acc_conds_;
const tgba_sba_proxy* degen_;
};
} // anonymous
std::ostream&
never_claim_reachable(std::ostream& os, const tgba_sba_proxy* g,
never_claim_reachable(std::ostream& os, const tgba* g,
const ltl::formula* f, bool comments)
{
assert(g->number_of_acceptance_conditions() <= 1);
never_claim_bfs n(g, os, f, comments);
n.run();
return os;