From a71c0cb585e374905665a51c88c5a969e5c8ba71 Mon Sep 17 00:00:00 2001 From: dehnert Date: Mon, 7 Aug 2017 20:38:06 +0200 Subject: [PATCH] Made some sylvan Bdd creations explicit --- src/storm/storage/dd/InternalBdd.h | 6 +----- src/storm/storage/dd/sylvan/InternalSylvanAdd.cpp | 6 +++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/storm/storage/dd/InternalBdd.h b/src/storm/storage/dd/InternalBdd.h index 9dfe22ca3..d59b03ffb 100644 --- a/src/storm/storage/dd/InternalBdd.h +++ b/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_ */ diff --git a/src/storm/storage/dd/sylvan/InternalSylvanAdd.cpp b/src/storm/storage/dd/sylvan/InternalSylvanAdd.cpp index a6e3997c1..cf73720dd 100644 --- a/src/storm/storage/dd/sylvan/InternalSylvanAdd.cpp +++ b/src/storm/storage/dd/sylvan/InternalSylvanAdd.cpp @@ -611,7 +611,7 @@ namespace storm { summationVariables &= ddVariable; } - return InternalAdd(ddManager, this->sylvanMtbdd.AndExists(otherMatrix.getSylvanBdd().GetBDD(), summationVariables.getSylvanBdd())); + return InternalAdd(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(ddManager, this->sylvanMtbdd.AndExistsRF(otherMatrix.getSylvanBdd().GetBDD(), summationVariables.getSylvanBdd())); + return InternalAdd(ddManager, this->sylvanMtbdd.AndExistsRF(sylvan::Bdd(otherMatrix.getSylvanBdd().GetBDD()), summationVariables.getSylvanBdd())); } #endif @@ -633,7 +633,7 @@ namespace storm { summationVariables &= ddVariable; } - return InternalAdd(ddManager, this->sylvanMtbdd.AndExistsRN(otherMatrix.getSylvanBdd().GetBDD(), summationVariables.getSylvanBdd())); + return InternalAdd(ddManager, this->sylvanMtbdd.AndExistsRN(sylvan::Bdd(otherMatrix.getSylvanBdd().GetBDD()), summationVariables.getSylvanBdd())); } template