Rewrite tgba_succ_iterator_concrete::next for the fourth time
(or is it the fifth?). * src/tgba/succiterconcrete.hh (tgba_succ_iterator_concrete::trans_dest_, tgba_succ_iterator_concrete::trans_set_, tgba_succ_iterator_concrete::trans_set_left_, tgba_succ_iterator_concrete::neg_trans_set_): New attributes. * src/tgba/succiterconcrete.cc (tgba_succ_iterator_concrete::tgba_succ_iterator_concrete): Initialize new members. (tgba_succ_iterator_concrete::first): Likewise. (tgba_succ_iterator_concrete::next): Rewrite. * tgba/tgbabddcoredata.hh (tgba_bdd_core_data::acc_set): New attribute. * tgba/tgbabddcoredata.cc, tgba/tgbabddtranslatefactory.cc: Handle acc_set.
This commit is contained in:
parent
42680e82bf
commit
dfe74f3134
6 changed files with 147 additions and 41 deletions
|
|
@ -13,6 +13,7 @@ namespace spot
|
|||
var_set(bddtrue),
|
||||
notvar_set(bddtrue),
|
||||
varandnext_set(bddtrue),
|
||||
acc_set(bddtrue),
|
||||
notacc_set(bddtrue),
|
||||
negacc_set(bddtrue),
|
||||
next_to_now(bdd_newpair())
|
||||
|
|
@ -30,6 +31,7 @@ namespace spot
|
|||
var_set(copy.var_set),
|
||||
notvar_set(copy.notvar_set),
|
||||
varandnext_set(copy.varandnext_set),
|
||||
acc_set(copy.acc_set),
|
||||
notacc_set(copy.notacc_set),
|
||||
negacc_set(copy.negacc_set),
|
||||
next_to_now(bdd_copypair(copy.next_to_now))
|
||||
|
|
@ -50,6 +52,7 @@ namespace spot
|
|||
var_set(left.var_set & right.var_set),
|
||||
notvar_set(left.notvar_set & right.notvar_set),
|
||||
varandnext_set(left.varandnext_set & right.varandnext_set),
|
||||
acc_set(left.acc_set & right.acc_set),
|
||||
notacc_set(left.notacc_set & right.notacc_set),
|
||||
negacc_set(left.negacc_set & right.negacc_set),
|
||||
next_to_now(bdd_mergepairs(left.next_to_now, right.next_to_now))
|
||||
|
|
@ -102,6 +105,7 @@ namespace spot
|
|||
notnow_set &= acc;
|
||||
notnext_set &= acc;
|
||||
notvar_set &= acc;
|
||||
acc_set &= acc;
|
||||
negacc_set &= !acc;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue