rename set_acceptance_conditions as set_generalized_buchi
* src/hoaparse/hoaparse.yy, src/tgba/tgbagraph.hh, src/tgbaalgos/compsusp.cc, src/tgbaalgos/dtgbasat.cc, src/tgbaalgos/mask.cc, src/tgbaalgos/randomgraph.cc, src/tgbaalgos/sccfilter.cc, src/tgbaalgos/simulation.cc, src/tgbaalgos/stripacc.cc, src/tgba/tgba.hh: Here.
This commit is contained in:
parent
fd1f6c4d61
commit
76c676dba0
10 changed files with 16 additions and 15 deletions
|
|
@ -1249,7 +1249,7 @@ lbtt: lbtt-header lbtt-body ENDAUT
|
||||||
{
|
{
|
||||||
auto& acc = res.h->aut->acc();
|
auto& acc = res.h->aut->acc();
|
||||||
unsigned num = acc.num_sets();
|
unsigned num = acc.num_sets();
|
||||||
res.h->aut->set_acceptance_conditions(num);
|
res.h->aut->set_generalized_buchi(num);
|
||||||
res.pos_acc_sets = acc.all_sets();
|
res.pos_acc_sets = acc.all_sets();
|
||||||
assert(!res.states_map.empty());
|
assert(!res.states_map.empty());
|
||||||
auto n = res.states_map.size();
|
auto n = res.states_map.size();
|
||||||
|
|
@ -1284,7 +1284,7 @@ lbtt: lbtt-header lbtt-body ENDAUT
|
||||||
}
|
}
|
||||||
| lbtt-header-states LBTT_EMPTY
|
| lbtt-header-states LBTT_EMPTY
|
||||||
{
|
{
|
||||||
res.h->aut->set_acceptance_conditions($2);
|
res.h->aut->set_generalized_buchi($2);
|
||||||
res.pos_acc_sets = res.h->aut->acc().all_sets();
|
res.pos_acc_sets = res.h->aut->acc().all_sets();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -639,8 +639,10 @@ namespace spot
|
||||||
acc_cond acc_;
|
acc_cond acc_;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
auto get_acceptance() const
|
acc_cond::acc_code get_acceptance() const
|
||||||
SPOT_RETURN(acc_.get_acceptance());
|
{
|
||||||
|
return acc_.get_acceptance();
|
||||||
|
}
|
||||||
|
|
||||||
void set_acceptance(unsigned num, const acc_cond::acc_code& c)
|
void set_acceptance(unsigned num, const acc_cond::acc_code& c)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -334,8 +334,7 @@ namespace spot
|
||||||
return g_.trans_data(t);
|
return g_.trans_data(t);
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME: Should be renamed as set_generalized_buchi()
|
void set_generalized_buchi(unsigned num)
|
||||||
void set_acceptance_conditions(unsigned num)
|
|
||||||
{
|
{
|
||||||
if (num < acc_.num_sets())
|
if (num < acc_.num_sets())
|
||||||
{
|
{
|
||||||
|
|
@ -351,7 +350,7 @@ namespace spot
|
||||||
|
|
||||||
acc_cond::mark_t set_single_acceptance_set()
|
acc_cond::mark_t set_single_acceptance_set()
|
||||||
{
|
{
|
||||||
set_acceptance_conditions(1);
|
set_generalized_buchi(1);
|
||||||
return acc_.mark(0);
|
return acc_.mark(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -378,7 +377,7 @@ namespace spot
|
||||||
return g_.trans_storage(t);
|
return g_.trans_storage(t);
|
||||||
}
|
}
|
||||||
|
|
||||||
void set_acceptance_conditions(bdd all);
|
void set_generalized_buchi(bdd all);
|
||||||
|
|
||||||
unsigned new_state()
|
unsigned new_state()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -226,7 +226,7 @@ namespace spot
|
||||||
|
|
||||||
const acc_cond& la = left->acc();
|
const acc_cond& la = left->acc();
|
||||||
const acc_cond& ra = right->acc();
|
const acc_cond& ra = right->acc();
|
||||||
res->set_acceptance_conditions(la.num_sets() + ra.num_sets());
|
res->set_generalized_buchi(la.num_sets() + ra.num_sets());
|
||||||
|
|
||||||
acc_cond::mark_t radd = ra.all_sets();
|
acc_cond::mark_t radd = ra.all_sets();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -779,7 +779,7 @@ namespace spot
|
||||||
auto autdict = aut->get_dict();
|
auto autdict = aut->get_dict();
|
||||||
auto a = make_tgba_digraph(autdict);
|
auto a = make_tgba_digraph(autdict);
|
||||||
a->copy_ap_of(aut);
|
a->copy_ap_of(aut);
|
||||||
a->set_acceptance_conditions(satdict.cand_nacc);
|
a->set_generalized_buchi(satdict.cand_nacc);
|
||||||
|
|
||||||
a->new_states(satdict.cand_size);
|
a->new_states(satdict.cand_size);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ namespace spot
|
||||||
unsigned na = inacc.num_sets();
|
unsigned na = inacc.num_sets();
|
||||||
unsigned tr = to_remove.count();
|
unsigned tr = to_remove.count();
|
||||||
assert(tr <= na);
|
assert(tr <= na);
|
||||||
res->set_acceptance_conditions(na - tr);
|
res->set_generalized_buchi(na - tr);
|
||||||
transform_accessible(in, res, [&](unsigned,
|
transform_accessible(in, res, [&](unsigned,
|
||||||
bdd& cond,
|
bdd& cond,
|
||||||
acc_cond::mark_t& acc,
|
acc_cond::mark_t& acc,
|
||||||
|
|
|
||||||
|
|
@ -134,7 +134,7 @@ namespace spot
|
||||||
for (auto i: *ap)
|
for (auto i: *ap)
|
||||||
props[pi++] = dict->register_proposition(i, res);
|
props[pi++] = dict->register_proposition(i, res);
|
||||||
|
|
||||||
res->set_acceptance_conditions(n_accs);
|
res->set_generalized_buchi(n_accs);
|
||||||
|
|
||||||
// Using std::unordered_set instead of std::set for these sets is 3
|
// Using std::unordered_set instead of std::set for these sets is 3
|
||||||
// times slower (tested on a 50000 nodes example).
|
// times slower (tested on a 50000 nodes example).
|
||||||
|
|
|
||||||
|
|
@ -275,7 +275,7 @@ namespace spot
|
||||||
inout.push_back(-1U);
|
inout.push_back(-1U);
|
||||||
|
|
||||||
filtered->
|
filtered->
|
||||||
set_acceptance_conditions(filter.accsets(aut->acc().num_sets()));
|
set_generalized_buchi(filter.accsets(aut->acc().num_sets()));
|
||||||
filtered->new_states(out_n);
|
filtered->new_states(out_n);
|
||||||
for (unsigned isrc = 0; isrc < in_n; ++isrc)
|
for (unsigned isrc = 0; isrc < in_n; ++isrc)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -628,7 +628,7 @@ namespace spot
|
||||||
delete gb;
|
delete gb;
|
||||||
res->prop_copy(original_,
|
res->prop_copy(original_,
|
||||||
{ false, // state-based acc forced below
|
{ false, // state-based acc forced below
|
||||||
false, // single acc set by set_acceptance_conditions
|
false, // single acc set by set_generalized_buchi
|
||||||
true, // weakness preserved,
|
true, // weakness preserved,
|
||||||
false, // determinism checked and set below
|
false, // determinism checked and set below
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,6 @@ namespace spot
|
||||||
for (unsigned s = 0; s < n; ++s)
|
for (unsigned s = 0; s < n; ++s)
|
||||||
for (auto& t: a->out(s))
|
for (auto& t: a->out(s))
|
||||||
t.acc = 0U;
|
t.acc = 0U;
|
||||||
a->set_acceptance_conditions(0);
|
a->set_generalized_buchi(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue