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

* src/misc/minato.hh (minato_isop(bdd,bdd)): New constructor variant.

Browse source 
(minato_isop::local_vars::vars): New attribute.
(minato_isop::local_vars::local_vars): Add the vars arguments.
(minato_isop::todo, minato_isop::cube, minato_isop::ret): Rename as ...
(minato_isop::todo_, minato_isop::cube_, minato_isop::ret_): ... these.
* src/misc/minato.cc: Adjust to factorize only variables in vars.
This commit is contained in:
Alexandre Duret-Lutz 2003-11-24 11:24:34 +00:00
parent e6c113f953
commit 3126e49b28
3 changed files with 86 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/misc/minato.hh
View file

@ -52,6 +52,10 @@ namespace spot
/// \brief Conctructor.
/// \arg input The BDD function to translate in ISOP.
minato_isop(bdd input);
/// \brief Conctructor.
/// \arg input The BDD function to translate in ISOP.
/// \arg vars The set of BDD variables to factorize in \a input.
minato_isop(bdd input, bdd vars);
/// \brief Compute the next sum term of the ISOP form.
/// Return \c bddfalse when all terms have been output.
bdd next();
@ -70,16 +74,19 @@ namespace spot
// we had to split it in four step (each step is separated
// from the other by a call to ISOP in the original algorithm).
enum { FirstStep, SecondStep, ThirdStep, FourthStep } step;
// The list of variable to factorize. This is an addition to
// the original algorithm.
bdd vars;
bdd v1;
bdd f0_min, f0_max;
bdd f1_min, f1_max;
bdd g0, g1;
local_vars(bdd f_min, bdd f_max)
: f_min(f_min), f_max(f_max), step(FirstStep) {}
local_vars(bdd f_min, bdd f_max, bdd vars)
: f_min(f_min), f_max(f_max), step(FirstStep), vars(vars) {}
};
std::stack<local_vars> todo;
std::stack<bdd> cube;
bdd ret;
std::stack<local_vars> todo_;
std::stack<bdd> cube_;
bdd ret_;
};
}