8e3a24ad5c
refer to accepting conditions. * src/tgba/tgbabddconcretefactory.hh: Likewise. * src/tgba/tgbabddcoredata.hh: Likewise. * src/tgba/dictunion.cc: Likewise. * src/tgba/tgba.hh: Likewise.
80 lines
1.9 KiB
C++
80 lines
1.9 KiB
C++
#include <set>
|
|
#include "dictunion.hh"
|
|
#include "ltlvisit/clone.hh"
|
|
#include <bdd.h>
|
|
#include <cassert>
|
|
|
|
namespace spot
|
|
{
|
|
|
|
tgba_bdd_dict
|
|
tgba_bdd_dict_union(const tgba_bdd_dict& l, const tgba_bdd_dict& r)
|
|
{
|
|
std::set<const ltl::formula*> now;
|
|
std::set<const ltl::formula*> var;
|
|
std::set<const ltl::formula*> acc;
|
|
|
|
tgba_bdd_dict::fv_map::const_iterator i;
|
|
|
|
// Merge Now variables.
|
|
for (i = l.now_map.begin(); i != l.now_map.end(); ++i)
|
|
now.insert(i->first);
|
|
for (i = r.now_map.begin(); i != r.now_map.end(); ++i)
|
|
now.insert(i->first);
|
|
|
|
// Merge atomic propositions.
|
|
for (i = l.var_map.begin(); i != l.var_map.end(); ++i)
|
|
var.insert(i->first);
|
|
for (i = r.var_map.begin(); i != r.var_map.end(); ++i)
|
|
var.insert(i->first);
|
|
|
|
// Merge accepting conditions.
|
|
for (i = l.acc_map.begin(); i != l.acc_map.end(); ++i)
|
|
acc.insert(i->first);
|
|
for (i = r.acc_map.begin(); i != r.acc_map.end(); ++i)
|
|
acc.insert(i->first);
|
|
|
|
// Ensure we have enough BDD variables.
|
|
int have = bdd_extvarnum(0);
|
|
int want = now.size() * 2 + var.size() + acc.size();
|
|
if (have < want)
|
|
bdd_setvarnum(want);
|
|
|
|
// Fill in the "defragmented" union dictionary.
|
|
|
|
// FIXME: Make some experiments with ordering of acc/var/now variables.
|
|
// Maybe there is one order that usually produces smaller BDDs?
|
|
|
|
// Next BDD variable to use.
|
|
int v = 0;
|
|
|
|
tgba_bdd_dict res;
|
|
|
|
std::set<const ltl::formula*>::const_iterator f;
|
|
for (f = acc.begin(); f != acc.end(); ++f)
|
|
{
|
|
clone(*f);
|
|
res.acc_map[*f] = v;
|
|
res.acc_formula_map[v] = *f;
|
|
++v;
|
|
}
|
|
for (f = var.begin(); f != var.end(); ++f)
|
|
{
|
|
clone(*f);
|
|
res.var_map[*f] = v;
|
|
res.var_formula_map[v] = *f;
|
|
++v;
|
|
}
|
|
for (f = now.begin(); f != now.end(); ++f)
|
|
{
|
|
clone(*f);
|
|
res.now_map[*f] = v;
|
|
res.now_formula_map[v] = *f;
|
|
v += 2;
|
|
}
|
|
|
|
assert (v == want);
|
|
return res;
|
|
}
|
|
|
|
}
|