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

twa: rename the is_* getters as prop_*

Browse source 
This fixes #116.

* src/twa/twa.hh: Rename those methods.
* NEWS: Document the renamings.
* doc/org/hoa.org, doc/org/tut21.org, src/parseaut/parseaut.yy,
src/tests/ikwiad.cc, src/twa/twagraph.hh,
src/twaalgos/are_isomorphic.cc, src/twaalgos/complete.cc,
src/twaalgos/degen.cc, src/twaalgos/dot.cc, src/twaalgos/dtbasat.cc,
src/twaalgos/dtgbasat.cc, src/twaalgos/hoa.cc, src/twaalgos/isdet.cc,
src/twaalgos/isunamb.cc, src/twaalgos/lbtt.cc,
src/twaalgos/minimize.cc, src/twaalgos/postproc.cc,
src/twaalgos/product.cc, src/twaalgos/randomgraph.cc,
src/twaalgos/remfin.cc, src/twaalgos/sbacc.cc,
src/twaalgos/simulation.cc, src/twaalgos/stutter.cc,
src/twaalgos/totgba.cc: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2015-11-05 09:51:53 +01:00
parent 8ea5f73c1a
commit cbb2e64e7c
26 changed files with 105 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/parseaut/parseaut.yy
View file

@ -1158,7 +1158,7 @@ dstar_header: dstar_sizes
res.h->aut->new_states(res.states);;
res.info_states.resize(res.states);
}
res.h->aut->prop_state_based_acc(true);
res.h->aut->prop_state_acc(true);
res.h->aut->prop_deterministic(true);
// res.h->aut->prop_complete();
fill_guards(res);
@ -1303,7 +1303,7 @@ dstar_states:
never: "never" { res.namer = res.h->aut->create_namer<std::string>();
res.h->aut->set_buchi();
res.h->aut->prop_state_based_acc(true);
res.h->aut->prop_state_acc(true);
res.acc_state = State_Acc;
res.pos_acc_sets = res.h->aut->acc().all_sets();
}
@ -1560,7 +1560,7 @@ lbtt-header-states: LBTT
lbtt-header: lbtt-header-states INT_S
{
res.acc_mapper = new spot::acc_mapper_int(res.h->aut, $2);
res.h->aut->prop_state_based_acc(true);
res.h->aut->prop_state_acc(true);
res.acc_state = State_Acc;
}
| lbtt-header-states INT
@ -1869,7 +1869,7 @@ static void fix_properties(result_& r)
//r.h->aut->prop_complete(r.complete);
if (r.acc_style == State_Acc ||
(r.acc_style == Mixed_Acc && !r.trans_acc_seen))
r.h->aut->prop_state_based_acc(true);
r.h->aut->prop_state_acc(true);
}
static void check_version(const result_& r)

2
src/tests/ikwiad.cc
View file

@ -1026,7 +1026,7 @@ checked_main(int argc, char** argv)
if (scc_filter)
{
tm.start("SCC-filter");
if (a->has_state_based_acc() & !scc_filter_all)
if (a->prop_state_acc() & !scc_filter_all)
a = spot::scc_filter_states(ensure_digraph(a));
else
a = spot::scc_filter(ensure_digraph(a), scc_filter_all);

36
src/twa/twa.hh
View file

@ -706,7 +706,7 @@ namespace spot
set_num_sets_(num);
acc_.set_acceptance(c);
if (num == 0)
prop_state_based_acc(true);
prop_state_acc(true);
}
/// \brief Copy the acceptance condition of another tgba.
@ -715,7 +715,7 @@ namespace spot
acc_ = a->acc();
unsigned num = acc_.num_sets();
if (num == 0)
prop_state_based_acc(true);
prop_state_acc(true);
}
void copy_ap_of(const const_twa_ptr& a)
@ -730,7 +730,7 @@ namespace spot
set_num_sets_(num);
acc_.set_generalized_buchi();
if (num == 0)
prop_state_based_acc(true);
prop_state_acc(true);
}
acc_cond::mark_t set_buchi()
@ -805,22 +805,22 @@ namespace spot
named_prop_.clear();
}
bool has_state_based_acc() const
bool prop_state_acc() const
{
return is.state_based_acc;
}
void prop_state_based_acc(bool val)
void prop_state_acc(bool val)
{
is.state_based_acc = val;
}
bool is_sba() const
{
return has_state_based_acc() && acc().is_buchi();
return prop_state_acc() && acc().is_buchi();
}
bool is_inherently_weak() const
bool prop_inherently_weak() const
{
return is.inherently_weak;
}
@ -830,7 +830,7 @@ namespace spot
is.inherently_weak = val;
}
bool is_deterministic() const
bool prop_deterministic() const
{
return is.deterministic;
}
@ -840,7 +840,7 @@ namespace spot
is.deterministic = val;
}
bool is_unambiguous() const
bool prop_unambiguous() const
{
return is.unambiguous;
}
@ -850,12 +850,12 @@ namespace spot
is.unambiguous = val;
}
bool is_stutter_invariant() const
bool prop_stutter_invariant() const
{
return is.stutter_invariant;
}
bool is_stutter_sensitive() const
bool prop_stutter_sensitive() const
{
return is.stutter_sensitive;
}
@ -888,25 +888,25 @@ namespace spot
void prop_copy(const const_twa_ptr& other, prop_set p)
{
if (p.state_based)
prop_state_based_acc(other->has_state_based_acc());
prop_state_acc(other->prop_state_acc());
if (p.inherently_weak)
prop_inherently_weak(other->is_inherently_weak());
prop_inherently_weak(other->prop_inherently_weak());
if (p.deterministic)
{
prop_deterministic(other->is_deterministic());
prop_unambiguous(other->is_unambiguous());
prop_deterministic(other->prop_deterministic());
prop_unambiguous(other->prop_unambiguous());
}
if (p.stutter_inv)
{
prop_stutter_invariant(other->is_stutter_invariant());
prop_stutter_sensitive(other->is_stutter_sensitive());
prop_stutter_invariant(other->prop_stutter_invariant());
prop_stutter_sensitive(other->prop_stutter_sensitive());
}
}
void prop_keep(prop_set p)
{
if (!p.state_based)
prop_state_based_acc(false);
prop_state_acc(false);
if (!p.inherently_weak)
prop_inherently_weak(false);
if (!p.deterministic)

4
src/twa/twagraph.hh
View file

@ -433,7 +433,7 @@ namespace spot
acc_cond::mark_t state_acc_sets(unsigned s) const
{
assert(has_state_based_acc() || num_sets() == 0);
assert(prop_state_acc() || num_sets() == 0);
for (auto& t: g_.out(s))
// Stop at the first edge, since the remaining should be
// labeled identically.
@ -443,7 +443,7 @@ namespace spot
bool state_is_accepting(unsigned s) const
{
assert(has_state_based_acc() || num_sets() == 0);
assert(prop_state_acc() || num_sets() == 0);
for (auto& t: g_.out(s))
// Stop at the first edge, since the remaining should be
// labeled identically.

6
src/twaalgos/are_isomorphic.cc
View file

@ -113,7 +113,7 @@ namespace spot
isomorphism_checker::isomorphism_checker(const const_twa_graph_ptr ref)
{
ref_ = make_twa_graph(ref, twa::prop_set::all());
ref_deterministic_ = ref_->is_deterministic();
ref_deterministic_ = ref_->prop_deterministic();
if (!ref_deterministic_)
{
nondet_states_ = spot::count_nondet_states(ref_);
@ -130,14 +130,14 @@ namespace spot
if (ref_deterministic_)
{
if (aut->is_deterministic() || spot::is_deterministic(aut))
if (aut->prop_deterministic() || spot::is_deterministic(aut))
{
return are_isomorphic_det(ref_, aut);
}
}
else
{
if (aut->is_deterministic() ||
if (aut->prop_deterministic() ||
nondet_states_ != spot::count_nondet_states(aut))
{
return false;

2
src/twaalgos/complete.cc
View file

@ -114,7 +114,7 @@ namespace spot
}
// In case the automaton use state-based acceptance, propagate
// the acceptance of the first edge to the one we add.
if (!aut->has_state_based_acc())
if (!aut->prop_state_acc())
acc = 0U;
aut->new_edge(i, sink, missingcond, acc);
}

2
src/twaalgos/degen.cc
View file

@ -207,7 +207,7 @@ namespace spot
res->copy_ap_of(a);
res->set_buchi();
if (want_sba)
res->prop_state_based_acc(true);
res->prop_state_acc(true);
// Preserve determinism, weakness, and stutter-invariance
res->prop_copy(a, { false, true, true, true });

2
src/twaalgos/dot.cc
View file

@ -468,7 +468,7 @@ namespace spot
sn_ = aut->get_named_prop<std::vector<std::string>>("state-names");
if (opt_name_)
name_ = aut_->get_named_prop<std::string>("automaton-name");
mark_states_ = !opt_force_acc_trans_ && aut_->has_state_based_acc();
mark_states_ = !opt_force_acc_trans_ && aut_->prop_state_acc();
if (opt_shape_ == ShapeAuto)
{
if (sn_ || aut->num_states() > 100)

2
src/twaalgos/dtbasat.cc
View file

@ -640,7 +640,7 @@ namespace spot
a->copy_ap_of(aut);
acc_cond::mark_t acc = a->set_buchi();
if (state_based)
a->prop_state_based_acc(true);
a->prop_state_acc(true);
a->prop_deterministic(true);
a->new_states(satdict.cand_size);

6
src/twaalgos/dtgbasat.cc
View file

@ -1026,7 +1026,7 @@ namespace spot
auto a = make_twa_graph(autdict);
a->copy_ap_of(aut);
if (state_based)
a->prop_state_based_acc(true);
a->prop_state_acc(true);
a->prop_deterministic(true);
a->set_acceptance(satdict.cand_nacc, satdict.cand_acc);
a->new_states(satdict.cand_size);
@ -1303,7 +1303,7 @@ namespace spot
if (int preproc = om.get("preproc", 3))
{
postprocessor post;
auto sba = (state_based && a->has_state_based_acc()) ?
auto sba = (state_based && a->prop_state_acc()) ?
postprocessor::SBAcc : postprocessor::Any;
post.set_pref(postprocessor::Deterministic
| postprocessor::Complete
@ -1332,7 +1332,7 @@ namespace spot
// mode. If the desired output is a Büchi automaton, or not
// desired acceptance was specified, stop here. There is not
// point in minimizing a minimal automaton.
if (a->is_inherently_weak() && a->is_deterministic()
if (a->prop_inherently_weak() && a->prop_deterministic()
&& (target_is_buchi || !user_supplied_acc))
return a;
}

14
src/twaalgos/hoa.cc
View file

@ -153,8 +153,8 @@ namespace spot
is_colored = colored && (!has_state_acc || nodeadend);
// If the automaton declares that it is deterministic or
// state-based, make sure that it really is.
assert(!aut->is_deterministic() || deterministic);
assert(!aut->has_state_based_acc() || state_acc);
assert(!aut->prop_deterministic() || deterministic);
assert(!aut->prop_state_acc() || state_acc);
}
void number_all_ap()
@ -402,14 +402,14 @@ namespace spot
prop(" complete");
if (md.is_deterministic)
prop(" deterministic");
if (aut->is_unambiguous())
if (aut->prop_unambiguous())
prop(" unambiguous");
assert(!(aut->is_stutter_invariant() && aut->is_stutter_sensitive()));
if (aut->is_stutter_invariant())
assert(!(aut->prop_stutter_invariant() && aut->prop_stutter_sensitive()));
if (aut->prop_stutter_invariant())
prop(" stutter-invariant");
if (aut->is_stutter_sensitive())
if (aut->prop_stutter_sensitive())
prop(" stutter-sensitive");
if (aut->is_inherently_weak())
if (aut->prop_inherently_weak())
prop(" inherently-weak");
os << nl;

2
src/twaalgos/isdet.cc
View file

@ -63,7 +63,7 @@ namespace spot
bool
is_deterministic(const const_twa_graph_ptr& aut)
{
if (aut->is_deterministic())
if (aut->prop_deterministic())
return true;
return !count_nondet_states_aux<false>(aut);
}

4
src/twaalgos/isunamb.cc
View file

@ -27,7 +27,7 @@ namespace spot
{
bool is_unambiguous(const const_twa_graph_ptr& aut)
{
if (aut->is_deterministic() || aut->is_unambiguous())
if (aut->prop_deterministic() || aut->prop_unambiguous())
return true;
auto clean_a = scc_filter_states(aut);
if (clean_a->num_edges() == 0)
@ -41,6 +41,6 @@ namespace spot
bool check_unambiguous(const twa_graph_ptr& aut)
{
aut->prop_unambiguous(is_unambiguous(aut));
return aut->is_unambiguous();
return aut->prop_unambiguous();
}
}

2
src/twaalgos/lbtt.cc
View file

@ -133,7 +133,7 @@ namespace spot
throw std::runtime_error
("LBTT only supports generalized Büchi acceptance");
bool sba = g->has_state_based_acc();
bool sba = g->prop_state_acc();
if (opt)
switch (char c = *opt++)
{

8
src/twaalgos/minimize.cc
View file

@ -122,7 +122,7 @@ namespace spot
auto dict = a->get_dict();
auto res = make_twa_graph(dict);
res->copy_ap_of(a);
res->prop_state_based_acc(true);
res->prop_state_acc(true);
// For each set, create a state in the resulting automaton.
// For a state s, state_num[s] is the number of the state in the minimal
@ -483,7 +483,7 @@ namespace spot
res->prop_copy(a, { false, false, false, true });
res->prop_deterministic(true);
res->prop_inherently_weak(true);
res->prop_state_based_acc(true);
res->prop_state_acc(true);
return res;
}
@ -605,7 +605,7 @@ namespace spot
// If the input automaton was already weak and deterministic, the
// output is necessary correct.
if (aut_f->is_inherently_weak() && aut_f->is_deterministic())
if (aut_f->prop_inherently_weak() && aut_f->prop_deterministic())
return min_aut_f;
// if f is a syntactic obligation formula, the WDBA minimization
@ -654,7 +654,7 @@ namespace spot
if (product(min_aut_f, aut_neg_f)->is_empty())
{
// Complement the minimized WDBA.
assert(min_aut_f->is_inherently_weak());
assert(min_aut_f->prop_inherently_weak());
auto neg_min_aut_f = remove_fin(dtwa_complement(min_aut_f));
if (product(aut_f, neg_min_aut_f)->is_empty())
// Finally, we are now sure that it was safe

6
src/twaalgos/postproc.cc
View file

@ -146,7 +146,7 @@ namespace spot
return a;
// If the automaton is weak, using transition-based acceptance
// won't help, so let's preserve it.
if ((state_based_ || a->is_inherently_weak()) && a->has_state_based_acc())
if ((state_based_ || a->prop_inherently_weak()) && a->prop_state_acc())
return scc_filter_states(a, arg);
else
return scc_filter(a, arg);
@ -253,7 +253,7 @@ namespace spot
{
bool reject_bigger = (PREF_ == Small) && (level_ == Medium);
dba = minimize_obligation(a, f, nullptr, reject_bigger);
if (dba && dba->is_inherently_weak() && dba->is_deterministic())
if (dba && dba->prop_inherently_weak() && dba->prop_deterministic())
{
// The WDBA is a BA, so no degeneralization is required.
// We just need to add an acceptance set if there is none.
@ -272,7 +272,7 @@ namespace spot
// at hard levels if we want a small output.
if (!dba || (level_ == High && PREF_ == Small))
{
if (((SBACC_ && a->has_state_based_acc())
if (((SBACC_ && a->prop_state_acc())
|| (type_ == BA && a->is_sba()))
&& !tba_determinisation_)
{

16
src/twaalgos/product.cc
View file

@ -103,14 +103,14 @@ namespace spot
}
}
res->prop_deterministic(left->is_deterministic()
&& right->is_deterministic());
res->prop_stutter_invariant(left->is_stutter_invariant()
&& right->is_stutter_invariant());
res->prop_stutter_sensitive(left->is_stutter_sensitive()
&& right->is_stutter_sensitive());
res->prop_state_based_acc(left->has_state_based_acc()
&& right->has_state_based_acc());
res->prop_deterministic(left->prop_deterministic()
&& right->prop_deterministic());
res->prop_stutter_invariant(left->prop_stutter_invariant()
&& right->prop_stutter_invariant());
res->prop_stutter_sensitive(left->prop_stutter_sensitive()
&& right->prop_stutter_sensitive());
res->prop_state_acc(left->prop_state_acc()
&& right->prop_state_acc());
return res;
}
}

2
src/twaalgos/randomgraph.cc
View file

@ -132,7 +132,7 @@ namespace spot
if (deterministic)
res->prop_deterministic(true);
if (state_acc)
res->prop_state_based_acc(true);
res->prop_state_acc(true);
int props_n = ap->size();
int* props = new int[props_n];

16
src/twaalgos/remfin.cc
View file

@ -87,7 +87,7 @@ namespace spot
// check result, however it prevent recurring into this
// procedure, because empty() will call to_tgba() wich will
// call remove_fin()...
sccaut->prop_state_based_acc(false);
sccaut->prop_state_acc(false);
// If SCCAUT is empty, the SCC is BA-type (and none
// of its states are final). If SCCAUT is nonempty, the SCC
// is not BA type.
@ -153,7 +153,7 @@ namespace spot
acc_cond::mark_t inf_alone,
acc_cond::mark_t fin_alone)
{
assert(aut->has_state_based_acc());
assert(aut->prop_state_acc());
scc_info si(aut);
// For state-based Rabin automata, we check each SCC for
@ -227,7 +227,7 @@ namespace spot
res->new_states(nst);
res->set_buchi();
res->set_init_state(aut->get_init_state_number());
bool deterministic = aut->is_deterministic();
bool deterministic = aut->prop_deterministic();
std::vector<unsigned> state_map(aut->num_states());
for (unsigned n = 0; n < scc_max; ++n)
@ -307,7 +307,7 @@ namespace spot
static twa_graph_ptr
rabin_to_buchi_maybe(const const_twa_graph_ptr& aut)
{
if (!aut->has_state_based_acc())
if (!aut->prop_state_acc())
return nullptr;
auto code = aut->get_acceptance();
@ -468,7 +468,7 @@ namespace spot
// We will modify res in place, and the resulting
// automaton will only have one acceptance set.
acc_cond::mark_t all_acc = res->set_buchi();
res->prop_state_based_acc(true);
res->prop_state_acc(true);
res->prop_deterministic(true);
unsigned sink = res->num_states();
@ -508,7 +508,7 @@ namespace spot
return std::const_pointer_cast<twa_graph>(aut);
// FIXME: we should check whether the automaton is weak.
if (aut->is_inherently_weak() && is_deterministic(aut))
if (aut->prop_inherently_weak() && is_deterministic(aut))
return remove_fin_det_weak(aut);
if (auto maybe = streett_to_generalized_buchi_maybe(aut))
@ -668,7 +668,7 @@ namespace spot
res->set_acceptance(aut->num_sets() + extra_sets, new_code);
res->set_init_state(aut->get_init_state_number());
bool sbacc = aut->has_state_based_acc();
bool sbacc = aut->prop_state_acc();
scc_info si(aut);
unsigned nscc = si.scc_count();
std::vector<unsigned> state_map(nst);
@ -746,7 +746,7 @@ namespace spot
// If the input had no Inf, the output is a state-based automaton.
if (allinf == 0U)
res->prop_state_based_acc(true);
res->prop_state_acc(true);
res->purge_dead_states();
trace << "before cleanup: " << res->get_acceptance() << '\n';

4
src/twaalgos/sbacc.cc
View file

@ -26,14 +26,14 @@ namespace spot
{
twa_graph_ptr sbacc(twa_graph_ptr old)
{
if (old->has_state_based_acc())
if (old->prop_state_acc())
return old;
auto res = make_twa_graph(old->get_dict());
res->copy_ap_of(old);
res->copy_acceptance_of(old);
res->prop_copy(old, {false, true, true, true});
res->prop_state_based_acc(true);
res->prop_state_acc(true);
typedef std::pair<unsigned, acc_cond::mark_t> pair_t;
std::map<pair_t, unsigned> s2n;

4
src/twaalgos/simulation.cc
View file

@ -642,7 +642,7 @@ namespace spot
if (nb_minato == nb_satoneset && !Cosimulation)
res->prop_deterministic(true);
if (Sba)
res->prop_state_based_acc(true);
res->prop_state_acc(true);
return res;
}
@ -770,7 +770,7 @@ namespace spot
prev = next;
direct_simulation<false, Sba> simul(res ? res : t);
res = simul.run();
if (res->is_deterministic())
if (res->prop_deterministic())
break;
direct_simulation<true, Sba> cosimul(res);

4
src/twaalgos/stutter.cc
View file

@ -620,7 +620,7 @@ namespace spot
bool
check_stutter_invariance(const twa_graph_ptr& aut, formula f)
{
bool is_stut = aut->is_stutter_invariant();
bool is_stut = aut->prop_stutter_invariant();
if (is_stut)
return is_stut;
@ -634,7 +634,7 @@ namespace spot
// If the automaton is deterministic, we
// know how to complement it.
aut->prop_deterministic(is_deterministic(aut));
if (!aut->is_deterministic())
if (!aut->prop_deterministic())
return false;
neg = remove_fin(dtwa_complement(aut));
}

4
src/twaalgos/totgba.cc
View file

@ -164,7 +164,7 @@ namespace spot
bs2num[s] = out->new_state();
todo.push_back(s);
bool sbacc = in->has_state_based_acc();
bool sbacc = in->prop_state_acc();
// States of the original automaton are marked with s.pend == -1U.
const acc_cond::mark_t orig_copy(-1U);
@ -334,7 +334,7 @@ namespace spot
assert(cnf.front().mark == 0U);
res = make_twa_graph(aut->get_dict());
res->set_init_state(res->new_state());
res->prop_state_based_acc(true);
res->prop_state_acc(true);
res->prop_inherently_weak(true);
res->prop_deterministic(true);
res->prop_stutter_invariant(true);