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

get rid of prop_single_acc_set() and set_single_acc_set()

Browse source 
Fixes #64.

* src/tgba/tgba.hh: Here.
* src/tgbaalgos/complete.cc, src/tgbaalgos/degen.cc,
src/tgbaalgos/dtgbacomp.cc, src/tgbaalgos/mask.cc,
src/tgbaalgos/minimize.cc, src/tgbaalgos/remfin.cc,
src/tgbaalgos/sccfilter.cc, src/tgbaalgos/simulation.cc,
src/tgbaalgos/stutter.cc: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2015-03-18 21:50:37 +01:00
parent d2f11e4075
commit b803a0ee4d
10 changed files with 11 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/tgba/tgba.hh
View file

@ -658,7 +658,6 @@ namespace spot
{
set_num_sets_(num);
acc_.set_acceptance(c);
prop_single_acc_set(!acc_.uses_fin_acceptance() && num == 1);
if (num == 0)
prop_state_based_acc();
}
@ -668,7 +667,6 @@ namespace spot
{
acc_ = a->acc();
unsigned num = acc_.num_sets();
prop_single_acc_set(!acc_.uses_fin_acceptance() && num == 1);
if (num == 0)
prop_state_based_acc();
}
@ -682,7 +680,6 @@ namespace spot
{
set_num_sets_(num);
acc_.set_generalized_buchi();
prop_single_acc_set(num == 1);
if (num == 0)
prop_state_based_acc();
}
@ -706,7 +703,6 @@ namespace spot
// holds, but false means the property is unknown.
struct bprop
{
bool single_acc_set:1; // A single acceptance set.
bool state_based_acc:1; // State-based acceptance.
bool inherently_weak:1; // Weak automaton.
bool deterministic:1; // Deterministic automaton.
@ -748,16 +744,6 @@ namespace spot
}
#endif
bool has_single_acc_set() const
{
return is.single_acc_set;
}
void prop_single_acc_set(bool val = true)
{
is.single_acc_set = val;
}
bool has_state_based_acc() const
{
return is.state_based_acc;
@ -770,7 +756,7 @@ namespace spot
bool is_sba() const
{
return has_state_based_acc() && has_single_acc_set();
return has_state_based_acc() && acc().is_buchi();
}
bool is_inherently_weak() const
@ -806,14 +792,13 @@ namespace spot
struct prop_set
{
bool state_based;
bool single_acc;
bool inherently_weak;
bool deterministic;
bool stutter_inv;
static prop_set all()
{
return { true, true, true, true, true };
return { true, true, true, true };
}
};
@ -823,8 +808,6 @@ namespace spot
{
if (p.state_based)
prop_state_based_acc(other->has_state_based_acc());
if (p.single_acc)
prop_single_acc_set(other->has_single_acc_set());
if (p.inherently_weak)
prop_inherently_weak(other->is_inherently_weak());
if (p.deterministic)
@ -837,8 +820,6 @@ namespace spot
{
if (!p.state_based)
prop_state_based_acc(false);
if (!p.single_acc)
prop_single_acc_set(false);
if (!p.inherently_weak)
prop_inherently_weak(false);
if (!p.deterministic)