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

* src/tgbaalgos/emptinesscheck.cc

Browse source 
(emptiness_check::tgba_emptiness_check,
emptiness_check::accepting_path): Simplify BDD operations.
This commit is contained in:
Alexandre Duret-Lutz 2003-10-22 14:50:10 +00:00
parent 558642fe9c
commit 3784895ec7
2 changed files with 15 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2003-10-22 Alexandre Duret-Lutz <adl@src.lip6.fr> 2003-10-22 Alexandre Duret-Lutz <adl@src.lip6.fr>
* src/tgbaalgos/emptinesscheck.cc
(emptiness_check::tgba_emptiness_check,
emptiness_check::accepting_path): Simplify BDD operations.
* src/tgbaalgos/emptinesscheck.cc, src/tgbaalgos/emptinesscheck.hh: * src/tgbaalgos/emptinesscheck.cc, src/tgbaalgos/emptinesscheck.hh:
Reindent. Reindent.
(emptiness_check::~emptiness_check, emptiness_check::emptiness_check): (emptiness_check::~emptiness_check, emptiness_check::emptiness_check):

32
src/tgbaalgos/emptinesscheck.cc
View file

@ -151,11 +151,7 @@ namespace spot
assert(!root_component.empty()); assert(!root_component.empty());
connected_component comp = root_component.top(); connected_component comp = root_component.top();
root_component.pop(); root_component.pop();
bdd new_condition = bddfalse; bdd new_condition = current_accepting;
new_condition = bdd_apply(new_condition, current_accepting,
bddop_or);
new_condition = bdd_apply(new_condition, comp.condition,
bddop_or);
int current_index = seen_state_num[current_state]; int current_index = seen_state_num[current_state];
while (comp.index > current_index) while (comp.index > current_index)
{ {
@ -165,16 +161,13 @@ namespace spot
assert(!root_component.empty()); assert(!root_component.empty());
comp = root_component.top(); comp = root_component.top();
root_component.pop(); root_component.pop();
new_condition = bdd_apply(new_condition,comp.condition, new_condition |= comp.condition;
bddop_or);
assert(!arc_accepting.empty()); assert(!arc_accepting.empty());
bdd arc_acc = arc_accepting.top(); bdd arc_acc = arc_accepting.top();
arc_accepting.pop(); arc_accepting.pop();
new_condition = bdd_apply(new_condition, arc_acc, new_condition |= arc_acc;
bddop_or);
} }
comp.condition = bdd_apply(comp.condition, new_condition, comp.condition |= new_condition;
bddop_or);
if (aut_check->all_accepting_conditions() == comp.condition) if (aut_check->all_accepting_conditions() == comp.condition)
{ {
// A failure SCC is find, the automata is not empty. // A failure SCC is find, the automata is not empty.
@ -482,8 +475,7 @@ namespace spot
tgba_succ_iterator* c_iter = tgba_succ_iterator* c_iter =
aut_counter->succ_iter(curr_state); aut_counter->succ_iter(curr_state);
bdd curr_bdd = bdd curr_bdd =
bdd_apply(iter_->current_accepting_conditions(), iter_->current_accepting_conditions() | step_.second;
step_.second, bddop_or);
c_iter->first(); c_iter->first();
todo_path.push(triplet(pair_state_iter(curr_state, c_iter), todo_path.push(triplet(pair_state_iter(curr_state, c_iter),
curr_bdd)); curr_bdd));
@ -498,9 +490,9 @@ namespace spot
bdd last_ = iter_->current_accepting_conditions(); bdd last_ = iter_->current_accepting_conditions();
bdd prop_ = iter_->current_condition(); bdd prop_ = iter_->current_condition();
tmp_lst.push_back(state_proposition(curr_state, prop_)); tmp_lst.push_back(state_proposition(curr_state, prop_));
tmp_acc = bdd_apply(last_, step_.second, bddop_or); tmp_acc = last_ | step_.second;
bdd curr_in = bdd_apply(tmp_acc, to_accept, bddop_and); bdd curr_in = tmp_acc & to_accept;
bdd best_in = bdd_apply(best_acc, to_accept, bddop_and); bdd best_in = best_acc & to_accept;
if (curr_in == best_in) if (curr_in == best_in)
{ {
if (tmp_lst.size() < best_lst.size()) if (tmp_lst.size() < best_lst.size())
@ -514,8 +506,7 @@ namespace spot
} }
else else
{ {
if (bddtrue == bdd_apply(best_in, curr_in, if (bddtrue == (best_in >> curr_in))
bddop_imp))
{ {
cycle_path tmp(tmp_lst); cycle_path tmp(tmp_lst);
best_lst = tmp; best_lst = tmp;
@ -527,7 +518,7 @@ namespace spot
{ {
bdd last_ = iter_->current_accepting_conditions(); bdd last_ = iter_->current_accepting_conditions();
bdd prop_ = iter_->current_condition(); bdd prop_ = iter_->current_condition();
tmp_acc = bdd_apply(last_, step_.second, bddop_or); tmp_acc = last_ | step_.second;
tmp_lst.push_back(state_proposition(curr_state, tmp_lst.push_back(state_proposition(curr_state,
prop_)); prop_));
cycle_path tmp(tmp_lst); cycle_path tmp(tmp_lst);
@ -546,13 +537,12 @@ namespace spot
if (best_acc != to_accept) if (best_acc != to_accept)
{ {
bdd rec_to_acc = bdd_apply(to_accept, !best_acc, bddop_and); bdd rec_to_acc = to_accept - best_acc;
emptiness_check::accepting_path(aut_counter, comp_path, emptiness_check::accepting_path(aut_counter, comp_path,
periode.back().first, rec_to_acc); periode.back().first, rec_to_acc);
} }
else else
{ {
bdd rec_to_acc = bdd_apply(to_accept, !best_acc, bddop_and);
if (!periode.empty()) if (!periode.empty())
{ {
/// The path contains all accepting conditions. Then we /// The path contains all accepting conditions. Then we