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

* src/misc/bddalloc.cc (bdd_allocator::varnum): Suppress.

Browse source 
(bdd_allocator::bdd_allocator): Adjust.
(bdd_allocator::extvarnum): Always call bdd_varnum(), so that
it doesn't matter if the number of variable has been augmented
externally.
* src/misc/bddalloc.hh (bdd_allocator::varnum): Suppress.
This commit is contained in:
Alexandre Duret-Lutz 2004-05-17 13:17:13 +00:00
parent eccfdc6c1e
commit 7f1d5f597c
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,5 +1,12 @@
2004-05-17 Alexandre Duret-Lutz <adl@src.lip6.fr> 2004-05-17 Alexandre Duret-Lutz <adl@src.lip6.fr>
* src/misc/bddalloc.cc (bdd_allocator::varnum): Suppress.
(bdd_allocator::bdd_allocator): Adjust.
(bdd_allocator::extvarnum): Always call bdd_varnum(), so that
it doesn't matter if the number of variable has been augmented
externally.
* src/misc/bddalloc.hh (bdd_allocator::varnum): Suppress.
* src/ltlvisit/formlength.cc: Fix style to please sanity checks. * src/ltlvisit/formlength.cc: Fix style to please sanity checks.
* src/ltlvisit/lunabbrev.cc: Fix style to please sanity checks. * src/ltlvisit/lunabbrev.cc: Fix style to please sanity checks.

10
src/misc/bddalloc.cc
View file

@ -26,10 +26,9 @@
namespace spot namespace spot
{ {
bool bdd_allocator::initialized = false; bool bdd_allocator::initialized = false;
int bdd_allocator::varnum = 2;
bdd_allocator::bdd_allocator() bdd_allocator::bdd_allocator()
: lvarnum(varnum) : lvarnum(bdd_varnum())
{ {
initialize(); initialize();
fl.push_front(pos_lenght_pair(0, lvarnum)); fl.push_front(pos_lenght_pair(0, lvarnum));
@ -46,14 +45,15 @@ namespace spot
// to tune this. By the meantime, we take the typical values // to tune this. By the meantime, we take the typical values
// for large examples advocated by the BuDDy manual. // for large examples advocated by the BuDDy manual.
bdd_init(1000000, 10000); bdd_init(1000000, 10000);
bdd_setvarnum(varnum); bdd_setvarnum(2);
} }
void void
bdd_allocator::extvarnum(int more) bdd_allocator::extvarnum(int more)
{ {
// If varnum has been extended from another allocator, use int varnum = bdd_varnum();
// the new variables. // If varnum has been extended from another allocator (or
// externally), use the new variables.
if (lvarnum < varnum) if (lvarnum < varnum)
{ {
more -= varnum - lvarnum; more -= varnum - lvarnum;

1
src/misc/bddalloc.hh
View file

@ -44,7 +44,6 @@ namespace spot
using free_list::dump_free_list; using free_list::dump_free_list;
protected: protected:
static bool initialized; ///< Whether the BDD library has been initialized. static bool initialized; ///< Whether the BDD library has been initialized.
static int varnum; ///< number of variables in use in the BDD library.
int lvarnum; ///< number of variables in use in this allocator. int lvarnum; ///< number of variables in use in this allocator.
private: private:
/// Require more variables. /// Require more variables.