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

Safra: Fix usage of multiple acceptance conditions and fix text output.

Browse source 
* src/tgba/tgbasafracomplement.cc
(tgba_safra_complement::tgba_safra_complement)
(tgba_safra_complement::succ_iter): Correct the declaration and
use of multiple acceptance conditions.
(state_complement::to_string): Output the L set, not U.  The previous
code caused different states to share the same names, causing issues
with the text-based output (state with identical names get merged).
* src/tgba/tgbasafracomplement.hh
(tgba_safra_complement::acceptance_cond_vec_): Adjust type to
store BDDs.
* src/tgbatest/complementation.cc: Implement a new "-b" option
to output automata in Spot's syntax.
* src/tgbatest/complementation.test: Add a test-case supplied
by Martin Dieguez Lodeiro.
* THANKS: Add Martin.
This commit is contained in:
Alexandre Duret-Lutz 2011-10-23 23:06:35 +02:00
parent ff3c02f51d
commit a4d1e18bf3
6 changed files with 77 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/tgba/tgbasafracomplement.cc
View file

@ -942,8 +942,7 @@ namespace spot
if (other == this)
return 0;
const state_complement* s = down_cast<const state_complement*>(other);
if (s == 0)
return 1;
assert(s);
#if TRANSFORM_TO_TBA
// When we transform to TBA instead of TGBA, states depend on the U set.
if (U != s->U)
@ -993,9 +992,9 @@ namespace spot
ss << tree;
if (use_bitset)
{
ss << " - I:" << U;
ss << " - I:" << L;
#if TRANSFORM_TO_TBA
ss << " J:" << L;
ss << " J:" << U;
#endif
}
return ss.str();
@ -1147,14 +1146,19 @@ namespace spot
neg_acceptance_cond_ = bddtrue;
acceptance_cond_vec_.reserve(nb_acc);
for (unsigned i = 0; i < nb_acc; ++i)
{
int r = get_dict()->register_clone_acc(v, safra_);
all_acceptance_cond_ |= bdd_ithvar(r);
acceptance_cond_vec_[i] = r;
neg_acceptance_cond_ &= bdd_nithvar(r);
}
{
int r = get_dict()->register_clone_acc(v, safra_);
all_acceptance_cond_ &= bdd_nithvar(r);
all_acceptance_cond_ |= bdd_ithvar(r) & neg_acceptance_cond_;
neg_acceptance_cond_ &= bdd_nithvar(r);
acceptance_cond_vec_.push_back(bdd_ithvar(r));
}
for (unsigned i = 0; i < nb_acc; ++i)
{
bdd c = acceptance_cond_vec_[i];
acceptance_cond_vec_[i] = bdd_exist(neg_acceptance_cond_, c) & c;
}
#endif
}
tgba_safra_complement::~tgba_safra_complement()
@ -1278,15 +1282,8 @@ namespace spot
}
for (unsigned i = 0; i < l.size(); ++i)
{
if (!S[i])
{
if (condition == bddfalse)
condition = bdd_ithvar(acceptance_cond_vec_[i]);
else
condition &= bdd_ithvar(acceptance_cond_vec_[i]);
}
}
condition |= acceptance_cond_vec_[i];
#endif
}