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

nsa2tgba: Construct a tgba_digraph.

Browse source 
* src/priv/accmap.hh (acc_mapper_consecutive_int): New class.
* src/dstarparse/nsa2tgba.cc: Build a tgba_digraph, and simplify
using acc_mapper_consecutive_int.
This commit is contained in:
Alexandre Duret-Lutz 2014-08-05 11:57:33 +02:00
parent ed94a35bea
commit 7c0ce376c5
2 changed files with 57 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/priv/accmap.hh
View file

@ -93,19 +93,20 @@ namespace spot
}
};
// The acceptance sets are named using count integers, but we do not
// assume the numbers are necessarily consecutive.
class acc_mapper_int: public acc_mapper_common
// The acceptance sets are named using count consecutive integers.
class acc_mapper_consecutive_int: public acc_mapper_common
{
std::vector<bdd> usable_;
unsigned used_;
protected:
std::vector<bdd> vec_;
std::map<int, bdd> map_;
public:
acc_mapper_int(tgba_digraph *aut,
unsigned count,
ltl::environment& env = ltl::default_environment::instance())
: acc_mapper_common(aut, env), usable_(count), used_(0)
acc_mapper_consecutive_int(tgba_digraph *aut,
unsigned count,
ltl::environment& env =
ltl::default_environment::instance())
: acc_mapper_common(aut, env), vec_(count)
{
std::vector<int> vmap(count);
for (unsigned n = 0; n < count; ++n)
@ -121,26 +122,50 @@ namespace spot
for (unsigned n = 0; n < count; ++n)
{
int v = vmap[n];
usable_[n] = bdd_compose(neg_, bdd_nithvar(v), v);
vec_[n] = bdd_compose(neg_, bdd_nithvar(v), v);
}
commit();
}
std::pair<bool, bdd> lookup(unsigned n)
{
if (n < vec_.size())
return std::make_pair(true, vec_[n]);
else
return std::make_pair(false, bddfalse);
}
};
// The acceptance sets are named using count integers, but we do not
// assume the numbers are necessarily consecutive.
class acc_mapper_int: public acc_mapper_consecutive_int
{
unsigned used_;
std::map<int, bdd> map_;
public:
acc_mapper_int(tgba_digraph *aut,
unsigned count,
ltl::environment& env =
ltl::default_environment::instance())
: acc_mapper_consecutive_int(aut, count, env), used_(0)
{
}
std::pair<bool, bdd> lookup(unsigned n)
{
auto p = map_.find(n);
if (p != map_.end())
return std::make_pair(true, p->second);
if (used_ < usable_.size())
if (used_ < vec_.size())
{
bdd res = usable_[used_++];
bdd res = vec_[used_++];
map_[n] = res;
return std::make_pair(true, res);
}
return std::make_pair(false, bddfalse);
}
};
}
#endif // SPOT_PRIV_ACCCONV_HH