Browse Source

Small beauty fixes to the Cudd Interface

Former-commit-id: 631d5a20bd
tempestpy_adaptions
PBerger 11 years ago
parent
commit
7ab2a84c0f
  1. 2
      src/storage/dd/CuddDd.cpp
  2. 2
      src/storage/dd/CuddDdForwardIterator.cpp
  3. 2
      src/storage/dd/CuddDdManager.cpp

2
src/storage/dd/CuddDd.cpp

@ -507,7 +507,7 @@ namespace storm {
int* cube;
double value;
DdGen* generator = this->getCuddAdd().FirstCube(&cube, &value);
return DdForwardIterator<DdType::CUDD>(this->getDdManager(), generator, cube, value, static_cast<bool>(Cudd_IsGenEmpty(generator)), &this->getContainedMetaVariableNames(), enumerateDontCareMetaVariables);
return DdForwardIterator<DdType::CUDD>(this->getDdManager(), generator, cube, value, (Cudd_IsGenEmpty(generator) != 0), &this->getContainedMetaVariableNames(), enumerateDontCareMetaVariables);
}
DdForwardIterator<DdType::CUDD> Dd<DdType::CUDD>::end(bool enumerateDontCareMetaVariables) const {

2
src/storage/dd/CuddDdForwardIterator.cpp

@ -70,7 +70,7 @@ namespace storm {
if (this->relevantDontCareDdVariables.empty() || this->cubeCounter >= std::pow(2, this->relevantDontCareDdVariables.size()) - 1) {
// Get the next cube and check for emptiness.
ABDD::NextCube(generator, &cube, &value);
this->isAtEnd = static_cast<bool>(Cudd_IsGenEmpty(generator));
this->isAtEnd = (Cudd_IsGenEmpty(generator) != 0);
// In case we are not done yet, we get ready to treat the next cube.
if (!this->isAtEnd) {

2
src/storage/dd/CuddDdManager.cpp

@ -33,7 +33,7 @@ bool CuddOptionsRegistered = storm::settings::Settings::registerNewModule([] (st
namespace storm {
namespace dd {
DdManager<DdType::CUDD>::DdManager() : metaVariableMap(), cuddManager() {
this->cuddManager.SetMaxMemory(storm::settings::Settings::getInstance()->getOptionByLongName("cuddmaxmem").getArgument(0).getValueAsUnsignedInteger() * 1024 * 1024);
this->cuddManager.SetMaxMemory(static_cast<unsigned long>(storm::settings::Settings::getInstance()->getOptionByLongName("cuddmaxmem").getArgument(0).getValueAsUnsignedInteger() * 1024ul * 1024ul));
this->cuddManager.SetEpsilon(storm::settings::Settings::getInstance()->getOptionByLongName("cuddprec").getArgument(0).getValueAsDouble());
}

Loading…
Cancel
Save