Switch from "promises" to "accepting set". Fix the definitions
of these accepting set so that they are really usable. Provide a all_accepting_conditions() method for use in the emptyness check, and a neg_accepting_conditions() for products. Predeclare TGBA accepting conditions is the i/o. * src/tgba/bddprint.cc (want_prom): Rename as ... (want_prom): ... this. (print_handler): Adjust to display Acc[]. (print_acc_handler, bdd_print_acc): New functions. * src/tgba/bddprint.hh (print_acc_handler, bdd_print_acc): New functions. * src/tgba/succiter.hh (current_promise): Rename as ... (current_accepting_conditions): ... this. * src/tgba/succiterconcrete.cc (current_state): Rename next to now. (current_promise): Rename as ... (current_accepting_conditions): ... this, and compute the accepting conditions. * src/tgba/dictunion.cc, src/tgba/ltl2tgba.cc, src/tgba/succiterconcrete.hh, src/tgba/tgbabddconcretefactory.cc, src/tgba/tgbabddcoredata.cc, src/tgba/tgbabddcoredata.hh, src/tgba/tgbabdddict.hh, src/tgba/tgbabdddict.cc, src/tgba/tgbabddtranslatefactory.cc, src/tgbaalgos/dotty.cc: Adjust to new names. * src/tgba/tgba.hh (all_accepting_conditions, neg_accepting_conditions): New functions. * src/tgba/tgbabddconcretefactory.cc: Adjust to new names, and record accepting conditions instead of promises. * src/tgba/tgbabddcoredata.hh (accepting_conditions, all_accepting_conditions, negacc_set): New variables. (notnow_set, notprom_set, declare_promise): Rename as ... (notnext_set, notacc_set, declare_accepting_condition): ... these. * src/tgba/tgbaexplicit.hh (tgba_explicit_succ_iterator::current_promise): Rename as ... (tgba_explicit_succ_iterator::current_accepting_conditions): ... this. (tgba_explicit::add_promise): Rename as ... (tgba_explicit::add_accepting_condition): ... this. (tgba_explicit::declare_accepting_condition, tgba_explicit::has_accepting_condition): New variables. (tgba_explicit::get_promise): Rename as ... (tgba_explicit::get_accepting_condition): ... this. (tgba_explicit::all_accepting_conditions, tgba_explicit::neg_accepting_conditions): Implement them. (all_accepting_conditions, neg_accepting_conditions, all_accepting_conditions): New variables. (tgba_explicit_succ_iterator): Embed all_accepting_conditions_. * src/tgba/tgbaexplicit.cc: Likewise. * src/tgba/tgbaproduct.hh (tgba_product_succ_uterator): Embed left_neg_ and right_neg_. (tgba_product::all_accepting_conditions, tgba_product::neg_accepting_conditions): Implement them. * src/tgba/tgbatranslateproxy.hh: (tgba_translate_proxy::all_accepting_conditions, tgba_translate_proxy::neg_accepting_conditions): Implement them. * src/tgba/tgbatranslateproxy.cc: Likewise. * src/tgbaalgos/save.cc (save_rec): Call bdd_print (tgba_save_reachable): Output the `acc =' line. * src/tgbaparse/tgbaparse.yy: Support the for accepting conditions definitions using an "acc =" line at the start. Later, use has_accepting_condition while parsing accepting conditions to ensure they were declared. Disallow !cond in accepting conditions. * src/tgbaparse/tgbascan.ll (ACC_DEF): New token. * src/tgbatest/explicit.cc (main): Declare accepting conditions. * src/tgbatest/ltl2tgba.cc (main): Add support for the -a, -A, and -R new options. * src/tgbatest/tgbaread.cc (main): Really exit on parse error. * src/tgbatest/explicit.test, src/tgbatest/explprod.test, src/tgbatest/mixprod.test, src/tgbatest/readsave.test, src/tgbatest/tgbaread.test, src/tgbatest/tripprod.test: Reflect recent changes.
This commit is contained in:
Alexandre Duret-Lutz
parent
fbbfda43f2
commit
25e6cca4b4
37 changed files with 662 additions and 220 deletions
|
|
@ -1,4 +1,5 @@
|
|||
#include "ltlast/atomic_prop.hh"
|
||||
#include "ltlast/constant.hh"
|
||||
#include "ltlvisit/destroy.hh"
|
||||
#include "tgbaexplicit.hh"
|
||||
#include <cassert>
|
||||
|
|
@ -10,8 +11,8 @@ namespace spot
|
|||
// tgba_explicit_succ_iterator
|
||||
|
||||
tgba_explicit_succ_iterator::tgba_explicit_succ_iterator
|
||||
(const tgba_explicit::state* s)
|
||||
: s_(s)
|
||||
(const tgba_explicit::state* s, bdd all_acc)
|
||||
: s_(s), all_accepting_conditions_(all_acc)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -46,9 +47,9 @@ namespace spot
|
|||
}
|
||||
|
||||
bdd
|
||||
tgba_explicit_succ_iterator::current_promise()
|
||||
tgba_explicit_succ_iterator::current_accepting_conditions()
|
||||
{
|
||||
return (*i_)->promise;
|
||||
return (*i_)->accepting_conditions & all_accepting_conditions_;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -80,7 +81,9 @@ namespace spot
|
|||
|
||||
|
||||
tgba_explicit::tgba_explicit()
|
||||
: init_(0)
|
||||
: init_(0), all_accepting_conditions_(bddfalse),
|
||||
neg_accepting_conditions_(bddtrue),
|
||||
all_accepting_conditions_computed_(false)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -124,12 +127,13 @@ namespace spot
|
|||
transition* t = new transition;
|
||||
t->dest = d;
|
||||
t->condition = bddtrue;
|
||||
t->promise = bddtrue;
|
||||
t->accepting_conditions = bddfalse;
|
||||
s->push_back(t);
|
||||
return t;
|
||||
}
|
||||
|
||||
int tgba_explicit::get_condition(ltl::formula* f)
|
||||
bdd
|
||||
tgba_explicit::get_condition(ltl::formula* f)
|
||||
{
|
||||
assert(dynamic_cast<ltl::atomic_prop*>(f));
|
||||
tgba_bdd_dict::fv_map::iterator i = dict_.var_map.find(f);
|
||||
|
|
@ -145,45 +149,72 @@ namespace spot
|
|||
ltl::destroy(f);
|
||||
v = i->second;
|
||||
}
|
||||
return v;
|
||||
return ithvar(v);
|
||||
}
|
||||
|
||||
void tgba_explicit::add_condition(transition* t, ltl::formula* f)
|
||||
void
|
||||
tgba_explicit::add_condition(transition* t, ltl::formula* f)
|
||||
{
|
||||
t->condition &= ithvar(get_condition(f));
|
||||
t->condition &= get_condition(f);
|
||||
}
|
||||
|
||||
void tgba_explicit::add_neg_condition(transition* t, ltl::formula* f)
|
||||
void
|
||||
tgba_explicit::add_neg_condition(transition* t, ltl::formula* f)
|
||||
{
|
||||
t->condition &= ! ithvar(get_condition(f));
|
||||
t->condition &= ! get_condition(f);
|
||||
}
|
||||
|
||||
int tgba_explicit::get_promise(ltl::formula* f)
|
||||
void
|
||||
tgba_explicit::declare_accepting_condition(ltl::formula* f)
|
||||
{
|
||||
tgba_bdd_dict::fv_map::iterator i = dict_.prom_map.find(f);
|
||||
int v;
|
||||
if (i == dict_.prom_map.end())
|
||||
tgba_bdd_dict::fv_map::iterator i = dict_.acc_map.find(f);
|
||||
if (i == dict_.acc_map.end())
|
||||
{
|
||||
int v;
|
||||
v = create_node();
|
||||
dict_.prom_map[f] = v;
|
||||
dict_.prom_formula_map[v] = f;
|
||||
dict_.acc_map[f] = v;
|
||||
dict_.acc_formula_map[v] = f;
|
||||
neg_accepting_conditions_ &= !ithvar(v);
|
||||
}
|
||||
else
|
||||
}
|
||||
|
||||
bool
|
||||
tgba_explicit::has_accepting_condition(ltl::formula* f) const
|
||||
{
|
||||
tgba_bdd_dict::fv_map::const_iterator i = dict_.acc_map.find(f);
|
||||
return i != dict_.acc_map.end();
|
||||
}
|
||||
|
||||
bdd
|
||||
tgba_explicit::get_accepting_condition(ltl::formula* f)
|
||||
{
|
||||
ltl::constant* c = dynamic_cast<ltl::constant*>(f);
|
||||
if (c)
|
||||
{
|
||||
ltl::destroy(f);
|
||||
v = i->second;
|
||||
switch (c->val())
|
||||
{
|
||||
case ltl::constant::True:
|
||||
return bddtrue;
|
||||
case ltl::constant::False:
|
||||
return bddfalse;
|
||||
}
|
||||
/* Unreachable code. */
|
||||
assert(0);
|
||||
}
|
||||
|
||||
tgba_bdd_dict::fv_map::iterator i = dict_.acc_map.find(f);
|
||||
assert (i != dict_.acc_map.end());
|
||||
ltl::destroy(f);
|
||||
bdd v = ithvar(i->second);
|
||||
v &= bdd_exist(neg_accepting_conditions_, v);
|
||||
return v;
|
||||
}
|
||||
|
||||
void tgba_explicit::add_promise(transition* t, ltl::formula* f)
|
||||
void
|
||||
tgba_explicit::add_accepting_condition(transition* t, ltl::formula* f)
|
||||
{
|
||||
t->promise &= ithvar(get_promise(f));
|
||||
}
|
||||
|
||||
void tgba_explicit::add_neg_promise(transition* t, ltl::formula* f)
|
||||
{
|
||||
t->promise &= ! ithvar(get_promise(f));
|
||||
bdd c = get_accepting_condition(f);
|
||||
t->accepting_conditions |= c;
|
||||
}
|
||||
|
||||
state*
|
||||
|
|
@ -197,7 +228,8 @@ namespace spot
|
|||
{
|
||||
const state_explicit* s = dynamic_cast<const state_explicit*>(state);
|
||||
assert(s);
|
||||
return new tgba_explicit_succ_iterator(s->get_state());
|
||||
return new tgba_explicit_succ_iterator(s->get_state(),
|
||||
all_accepting_conditions());
|
||||
}
|
||||
|
||||
const tgba_bdd_dict&
|
||||
|
|
@ -216,4 +248,28 @@ namespace spot
|
|||
return i->second;
|
||||
}
|
||||
|
||||
bdd
|
||||
tgba_explicit::all_accepting_conditions() const
|
||||
{
|
||||
if (!all_accepting_conditions_computed_)
|
||||
{
|
||||
bdd all = bddfalse;
|
||||
tgba_bdd_dict::fv_map::const_iterator i;
|
||||
for (i = dict_.acc_map.begin(); i != dict_.acc_map.end(); ++i)
|
||||
{
|
||||
bdd v = ithvar(i->second);
|
||||
all |= v & bdd_exist(neg_accepting_conditions_, v);
|
||||
}
|
||||
all_accepting_conditions_ = all;
|
||||
all_accepting_conditions_computed_ = true;
|
||||
}
|
||||
return all_accepting_conditions_;
|
||||
}
|
||||
|
||||
bdd
|
||||
tgba_explicit::neg_accepting_conditions() const
|
||||
{
|
||||
return neg_accepting_conditions_;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue