Browse Source

Made some sylvan Bdd creations explicit

tempestpy_adaptions
dehnert 7 years ago
parent
commit
a71c0cb585
  1. 6
      src/storm/storage/dd/InternalBdd.h
  2. 6
      src/storm/storage/dd/sylvan/InternalSylvanAdd.cpp

6
src/storm/storage/dd/InternalBdd.h

@ -1,5 +1,4 @@
#ifndef STORM_STORAGE_DD_INTERNALBDD_H_
#define STORM_STORAGE_DD_INTERNALBDD_H_
#pragma once
#include "storm/storage/dd/DdType.h"
@ -9,6 +8,3 @@ namespace storm {
class InternalBdd;
}
}
#endif /* STORM_STORAGE_DD_CUDD_INTERNALBDD_H_ */

6
src/storm/storage/dd/sylvan/InternalSylvanAdd.cpp

@ -611,7 +611,7 @@ namespace storm {
summationVariables &= ddVariable;
}
return InternalAdd<DdType::Sylvan, ValueType>(ddManager, this->sylvanMtbdd.AndExists(otherMatrix.getSylvanBdd().GetBDD(), summationVariables.getSylvanBdd()));
return InternalAdd<DdType::Sylvan, ValueType>(ddManager, this->sylvanMtbdd.AndExists(sylvan::Bdd(otherMatrix.getSylvanBdd().GetBDD()), summationVariables.getSylvanBdd()));
}
#ifdef STORM_HAVE_CARL
@ -622,7 +622,7 @@ namespace storm {
summationVariables &= ddVariable;
}
return InternalAdd<DdType::Sylvan, storm::RationalFunction>(ddManager, this->sylvanMtbdd.AndExistsRF(otherMatrix.getSylvanBdd().GetBDD(), summationVariables.getSylvanBdd()));
return InternalAdd<DdType::Sylvan, storm::RationalFunction>(ddManager, this->sylvanMtbdd.AndExistsRF(sylvan::Bdd(otherMatrix.getSylvanBdd().GetBDD()), summationVariables.getSylvanBdd()));
}
#endif
@ -633,7 +633,7 @@ namespace storm {
summationVariables &= ddVariable;
}
return InternalAdd<DdType::Sylvan, storm::RationalNumber>(ddManager, this->sylvanMtbdd.AndExistsRN(otherMatrix.getSylvanBdd().GetBDD(), summationVariables.getSylvanBdd()));
return InternalAdd<DdType::Sylvan, storm::RationalNumber>(ddManager, this->sylvanMtbdd.AndExistsRN(sylvan::Bdd(otherMatrix.getSylvanBdd().GetBDD()), summationVariables.getSylvanBdd()));
}
template<typename ValueType>

Loading…
Cancel
Save