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

* src/tgbaalgos/tau03opt.cc (tau03_opt_search): Add options "weights"

Browse source 
and "redweights" (on by default).
This commit is contained in:
Alexandre Duret-Lutz 2005-02-22 17:37:33 +00:00
parent fa9614e997
commit dd1bc78786
2 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2005-02-22 Alexandre Duret-Lutz <adl@src.lip6.fr> 2005-02-22 Alexandre Duret-Lutz <adl@src.lip6.fr>
* src/tgbaalgos/tau03opt.cc (tau03_opt_search): Add options "weights"
and "redweights" (on by default).
* src/tgbaalgos/tau03opt.cc (tau03_opt_search): Do not * src/tgbaalgos/tau03opt.cc (tau03_opt_search): Do not
account for the size of condition_stack. account for the size of condition_stack.

25
src/tgbaalgos/tau03opt.cc
View file

@ -68,7 +68,9 @@ namespace spot
current_weight(a->neg_acceptance_conditions()), current_weight(a->neg_acceptance_conditions()),
h(size), h(size),
all_acc(a->all_acceptance_conditions()), all_acc(a->all_acceptance_conditions()),
use_condition_stack(o.get("condstack")) use_condition_stack(o.get("condstack")),
use_weights(o.get("weights", 1)),
use_red_weights(use_weights && o.get("redweights", 1))
{ {
} }
@ -165,6 +167,10 @@ namespace spot
/// Whether to use the "condition stack". /// Whether to use the "condition stack".
bool use_condition_stack; bool use_condition_stack;
/// Whether to use weights to abort earlier.
bool use_weights;
/// Whether to use weights in the red dfs.
bool use_red_weights;
bool dfs_blue() bool dfs_blue()
{ {
@ -186,6 +192,7 @@ namespace spot
if (c_prime.is_white()) if (c_prime.is_white())
{ {
trace << " It is white, go down" << std::endl; trace << " It is white, go down" << std::endl;
if (use_weights)
current_weight += acc; current_weight += acc;
inc_states(); inc_states();
h.add_new_state(s_prime, CYAN, current_weight); h.add_new_state(s_prime, CYAN, current_weight);
@ -195,9 +202,11 @@ namespace spot
{ {
typename heap::color_ref c = h.get_color_ref(f.s); typename heap::color_ref c = h.get_color_ref(f.s);
assert(!c.is_white()); assert(!c.is_white());
if (c_prime.get_color() == CYAN && if (c_prime.get_color() == CYAN
((current_weight - c_prime.get_weight()) | && all_acc == ((current_weight - c_prime.get_weight())
c.get_acc() | acc | c_prime.get_acc()) == all_acc) | c.get_acc()
| acc
| c_prime.get_acc()))
{ {
trace << " It is cyan and acceptance condition " trace << " It is cyan and acceptance condition "
<< "is reached, report cycle" << std::endl; << "is reached, report cycle" << std::endl;
@ -234,6 +243,7 @@ namespace spot
trace << " All the successors have been visited" << std::endl; trace << " All the successors have been visited" << std::endl;
stack_item f_dest(f); stack_item f_dest(f);
pop(st_blue); pop(st_blue);
if (use_weights)
current_weight -= f_dest.acc; current_weight -= f_dest.acc;
typename heap::color_ref c_prime = h.get_color_ref(f_dest.s); typename heap::color_ref c_prime = h.get_color_ref(f_dest.s);
assert(!c_prime.is_white()); assert(!c_prime.is_white());
@ -302,8 +312,11 @@ namespace spot
delete s_prime; delete s_prime;
} }
else if (c_prime.get_color() == CYAN && else if (c_prime.get_color() == CYAN &&
((current_weight - c_prime.get_weight()) | (all_acc == ((use_red_weights ?
c_prime.get_acc() | acu) == all_acc) (current_weight - c_prime.get_weight())
: bddfalse)
| c_prime.get_acc()
| acu)))
{ {
trace << " It is cyan and acceptance condition " trace << " It is cyan and acceptance condition "
<< "is reached, report cycle" << std::endl; << "is reached, report cycle" << std::endl;