moved CUDD-based DD implementation to own folder

Former-commit-id: a828f92518

src/CMakeLists.txt

@@ -34,7 +34,8 @@ file(GLOB STORM_SETTINGS_MODULES_FILES ${PROJECT_SOURCE_DIR}/src/settings/module
 file(GLOB_RECURSE STORM_SOLVER_FILES ${PROJECT_SOURCE_DIR}/src/solver/*.h ${PROJECT_SOURCE_DIR}/src/solver/*.cpp)
 file(GLOB STORM_STORAGE_FILES ${PROJECT_SOURCE_DIR}/src/storage/*.h ${PROJECT_SOURCE_DIR}/src/storage/*.cpp)
 file(GLOB STORM_STORAGE_BISIMULATION_FILES ${PROJECT_SOURCE_DIR}/src/storage/bisimulation/*.h ${PROJECT_SOURCE_DIR}/src/storage/bisimulation/*.cpp)
-file(GLOB_RECURSE STORM_STORAGE_DD_FILES ${PROJECT_SOURCE_DIR}/src/storage/dd/*.h ${PROJECT_SOURCE_DIR}/src/storage/dd/*.cpp)
+file(GLOB STORM_STORAGE_DD_FILES ${PROJECT_SOURCE_DIR}/src/storage/dd/*.h ${PROJECT_SOURCE_DIR}/src/storage/dd/*.cpp)
+file(GLOB_RECURSE STORM_STORAGE_DD_CUDD_FILES ${PROJECT_SOURCE_DIR}/src/storage/dd/cudd/*.h ${PROJECT_SOURCE_DIR}/src/storage/dd/cudd/*.cpp)
 file(GLOB_RECURSE STORM_STORAGE_EXPRESSIONS_FILES ${PROJECT_SOURCE_DIR}/src/storage/expressions/*.h ${PROJECT_SOURCE_DIR}/src/storage/expressions/*.cpp)
 file(GLOB_RECURSE STORM_STORAGE_PRISM_FILES ${PROJECT_SOURCE_DIR}/src/storage/prism/*.h ${PROJECT_SOURCE_DIR}/src/storage/prism/*.cpp)
 file(GLOB_RECURSE STORM_STORAGE_SPARSE_FILES ${PROJECT_SOURCE_DIR}/src/storage/sparse/*.h ${PROJECT_SOURCE_DIR}/src/storage/sparse/*.cpp)
@@ -80,6 +81,7 @@ source_group(solver FILES ${STORM_SOLVER_FILES})
 source_group(storage FILES ${STORM_STORAGE_FILES})
 source_group(storage\\bisimulation FILES ${STORM_STORAGE_BISIMULATION_FILES})
 source_group(storage\\dd FILES ${STORM_STORAGE_DD_FILES})
+source_group(storage\\dd\\cudd FILES ${STORM_STORAGE_DD_CUDD_FILES})
 source_group(storage\\expressions FILES ${STORM_STORAGE_EXPRESSIONS_FILES})
 source_group(storage\\prism FILES ${STORM_STORAGE_PRISM_FILES})
 source_group(storage\\sparse FILES ${STORM_STORAGE_SPARSE_FILES})

src/adapters/AddExpressionAdapter.cpp

@@ -4,9 +4,9 @@
 #include "src/exceptions/ExpressionEvaluationException.h"
 #include "src/exceptions/InvalidArgumentException.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 
 namespace storm {

src/builder/DdPrismModelBuilder.cpp

@@ -5,8 +5,8 @@
 #include "src/models/symbolic/Mdp.h"
 #include "src/models/symbolic/StandardRewardModel.h"
 
-#include "src/storage/dd/CuddDd.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddDd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 #include "src/settings/SettingsManager.h"
 
 #include "src/exceptions/InvalidStateException.h"
@@ -17,8 +17,8 @@
 #include "src/utility/math.h"
 #include "src/storage/prism/Program.h"
 
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 #include "src/settings/modules/GeneralSettings.h"
 

src/modelchecker/csl/HybridCtmcCslModelChecker.cpp

@@ -7,8 +7,8 @@
 
 #include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
 
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 namespace storm {
     namespace modelchecker {

src/modelchecker/csl/helper/HybridCtmcCslHelper.cpp

@@ -3,10 +3,10 @@
 #include "src/modelchecker/csl/helper/SparseCtmcCslHelper.h"
 #include "src/modelchecker/prctl/helper/HybridDtmcPrctlHelper.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
 
 #include "src/utility/macros.h"
 #include "src/utility/graph.h"

src/modelchecker/prctl/HybridDtmcPrctlModelChecker.cpp

@@ -3,8 +3,8 @@
 #include "src/modelchecker/prctl/helper/HybridDtmcPrctlHelper.h"
 #include "src/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h"
 
-#include "src/storage/dd/CuddOdd.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 
 #include "src/utility/macros.h"
 #include "src/utility/graph.h"

src/modelchecker/prctl/HybridMdpPrctlModelChecker.cpp

@@ -2,7 +2,7 @@
 
 #include "src/modelchecker/prctl/helper/HybridMdpPrctlHelper.h"
 
-#include "src/storage/dd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
 
 #include "src/models/symbolic/Mdp.h"
 #include "src/models/symbolic/StandardRewardModel.h"

src/modelchecker/prctl/helper/HybridDtmcPrctlHelper.cpp

@@ -3,10 +3,10 @@
 
 #include "src/solver/LinearEquationSolver.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
 
 #include "src/utility/graph.h"
 #include "src/utility/constants.h"

src/modelchecker/prctl/helper/HybridMdpPrctlHelper.cpp

@@ -1,9 +1,9 @@
 #include "src/modelchecker/prctl/helper/HybridMdpPrctlHelper.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
 
 #include "src/utility/graph.h"
 #include "src/utility/constants.h"

src/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.cpp

@@ -1,10 +1,10 @@
 #include "src/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.h"
 
 #include "src/storage/dd/DdType.h"
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
 
 #include "src/solver/SymbolicLinearEquationSolver.h"
 

src/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.cpp

@@ -2,10 +2,10 @@
 
 #include "src/solver/SymbolicMinMaxLinearEquationSolver.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
 
 #include "src/utility/graph.h"
 #include "src/utility/constants.h"

src/modelchecker/propositional/SymbolicPropositionalModelChecker.cpp

@@ -1,7 +1,7 @@
 #include "src/modelchecker/propositional/SymbolicPropositionalModelChecker.h"
 
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 
 #include "src/models/symbolic/Dtmc.h"
 #include "src/models/symbolic/Ctmc.h"

src/modelchecker/results/CheckResult.cpp

@@ -3,7 +3,7 @@
 #include "storm-config.h"
 #include "src/adapters/CarlAdapter.h"
 
-#include "src/storage/dd/CuddDd.h"
+#include "src/storage/dd/cudd/CuddDd.h"
 #include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
 #include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
 #include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"

src/modelchecker/results/HybridQuantitativeCheckResult.cpp

@@ -1,7 +1,7 @@
 #include "src/modelchecker/results/HybridQuantitativeCheckResult.h"
 #include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
 #include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 
 #include "src/exceptions/InvalidOperationException.h"
 #include "src/utility/macros.h"

src/modelchecker/results/HybridQuantitativeCheckResult.h

@@ -2,9 +2,9 @@
 #define STORM_MODELCHECKER_HYBRIDQUANTITATIVECHECKRESULT_H_
 
 #include "src/storage/dd/DdType.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
 #include "src/modelchecker/results/QuantitativeCheckResult.h"
 #include "src/utility/OsDetection.h"
 

src/modelchecker/results/SymbolicQualitativeCheckResult.cpp

@@ -1,6 +1,6 @@
 #include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
 
-#include "src/storage/dd/CuddDd.h"
+#include "src/storage/dd/cudd/CuddDd.h"
 #include "src/utility/macros.h"
 #include "src/exceptions/InvalidOperationException.h"
 

src/modelchecker/results/SymbolicQualitativeCheckResult.h

@@ -2,7 +2,7 @@
 #define STORM_MODELCHECKER_SYMBOLICQUALITATIVECHECKRESULT_H_
 
 #include "src/storage/dd/DdType.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 #include "src/modelchecker/results/QualitativeCheckResult.h"
 #include "src/utility/OsDetection.h"
 

src/modelchecker/results/SymbolicQuantitativeCheckResult.cpp

@@ -1,8 +1,8 @@
 #include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h"
 #include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
 
-#include "src/storage/dd/CuddDd.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddDd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 #include "src/exceptions/InvalidOperationException.h"
 #include "src/utility/macros.h"
 #include "src/utility/constants.h"

src/modelchecker/results/SymbolicQuantitativeCheckResult.h

@@ -2,7 +2,7 @@
 #define STORM_MODELCHECKER_SYMBOLICQUANTITATIVECHECKRESULT_H_
 
 #include "src/storage/dd/DdType.h"
-#include "src/storage/dd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
 #include "src/modelchecker/results/QuantitativeCheckResult.h"
 #include "src/utility/OsDetection.h"
 

src/models/symbolic/Ctmc.cpp

@@ -1,8 +1,8 @@
 #include "src/models/symbolic/Ctmc.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 #include "src/models/symbolic/StandardRewardModel.h"
 

src/models/symbolic/DeterministicModel.cpp

@@ -1,8 +1,8 @@
 #include "src/models/symbolic/DeterministicModel.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 #include "src/models/symbolic/StandardRewardModel.h"
 

src/models/symbolic/Dtmc.cpp

@@ -1,8 +1,8 @@
 #include "src/models/symbolic/Dtmc.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 #include "src/models/symbolic/StandardRewardModel.h"
 

src/models/symbolic/Mdp.cpp

@@ -1,8 +1,8 @@
 #include "src/models/symbolic/Mdp.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 #include "src/models/symbolic/StandardRewardModel.h"
 

src/models/symbolic/Model.cpp

@@ -7,9 +7,9 @@
 
 #include "src/adapters/AddExpressionAdapter.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 #include "src/models/symbolic/StandardRewardModel.h"
 

src/models/symbolic/NondeterministicModel.cpp

@@ -1,8 +1,8 @@
 #include "src/models/symbolic/NondeterministicModel.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 #include "src/models/symbolic/StandardRewardModel.h"
 

src/models/symbolic/StandardRewardModel.cpp

@@ -1,8 +1,8 @@
 #include "src/models/symbolic/StandardRewardModel.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 namespace storm {
     namespace models {

src/models/symbolic/StochasticTwoPlayerGame.cpp

@@ -1,8 +1,8 @@
 #include "src/models/symbolic/StochasticTwoPlayerGame.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 #include "src/models/symbolic/StandardRewardModel.h"
 

src/solver/SymbolicGameSolver.cpp

@@ -1,7 +1,7 @@
 #include "src/solver/SymbolicGameSolver.h"
 
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
 
 #include "src/settings/SettingsManager.h"
 #include "src/settings/modules/NativeEquationSolverSettings.h"

src/solver/SymbolicLinearEquationSolver.cpp

@@ -1,7 +1,7 @@
 #include "src/solver/SymbolicLinearEquationSolver.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
 
 #include "src/storage/dd/Add.h"
 

src/solver/SymbolicMinMaxLinearEquationSolver.cpp

@@ -1,7 +1,7 @@
 #include "src/solver/SymbolicMinMaxLinearEquationSolver.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
 
 #include "src/storage/dd/Add.h"
 

src/solver/SymbolicMinMaxLinearEquationSolver.h

@@ -9,7 +9,7 @@
 #include "src/storage/expressions/Variable.h"
 #include "src/storage/dd/DdType.h"
 
-#include "src/storage/dd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
 
 namespace storm {
     namespace dd {

src/storage/dd/CuddAdd.cpp → src/storage/dd/cudd/CuddAdd.cpp

@@ -2,10 +2,10 @@
 #include <algorithm>
 #include <boost/algorithm/string/join.hpp>
 
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddOdd.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 #include "src/utility/vector.h"
 #include "src/utility/macros.h"
 

src/storage/dd/CuddAdd.h → src/storage/dd/cudd/CuddAdd.h

@@ -5,8 +5,8 @@
 #include <map>
 
 #include "src/storage/dd/Add.h"
-#include "src/storage/dd/CuddDd.h"
-#include "src/storage/dd/CuddDdForwardIterator.h"
+#include "src/storage/dd/cudd/CuddDd.h"
+#include "src/storage/dd/cudd/CuddDdForwardIterator.h"
 #include "src/storage/expressions/Variable.h"
 #include "src/utility/OsDetection.h"
 

src/storage/dd/CuddBdd.cpp → src/storage/dd/cudd/CuddBdd.cpp

@@ -2,10 +2,10 @@
 #include <algorithm>
 #include <functional>
 
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddOdd.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 
 #include "src/storage/BitVector.h"
 

src/storage/dd/CuddBdd.h → src/storage/dd/cudd/CuddBdd.h

@@ -2,7 +2,7 @@
 #define STORM_STORAGE_DD_CUDDBDD_H_
 
 #include "src/storage/dd/Bdd.h"
-#include "src/storage/dd/CuddDd.h"
+#include "src/storage/dd/cudd/CuddDd.h"
 #include "src/utility/OsDetection.h"
 
 // Include the C++-interface of CUDD.

src/storage/dd/CuddDd.cpp → src/storage/dd/cudd/CuddDd.cpp

@@ -1,7 +1,7 @@
 #include <algorithm>
 
-#include "src/storage/dd/CuddDd.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddDd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 
 namespace storm {
     namespace dd {

src/storage/dd/CuddDdForwardIterator.cpp → src/storage/dd/cudd/CuddDdForwardIterator.cpp

@@ -1,5 +1,5 @@
-#include "src/storage/dd/CuddDdForwardIterator.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddDdForwardIterator.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 #include "src/storage/dd/DdMetaVariable.h"
 #include "src/utility/macros.h"
 #include "src/storage/expressions/ExpressionManager.h"

src/storage/dd/CuddDdManager.cpp → src/storage/dd/cudd/CuddDdManager.cpp

@@ -2,14 +2,14 @@
 #include <string>
 #include <algorithm>
 
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 #include "src/utility/macros.h"
 #include "src/storage/expressions/Variable.h"
 #include "src/exceptions/InvalidArgumentException.h"
 #include "src/settings/SettingsManager.h"
 #include "src/settings/modules/CuddSettings.h"
 #include "src/storage/expressions/ExpressionManager.h"
-#include "src/storage/dd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
 #include "CuddBdd.h"
 
 

src/storage/dd/CuddDdManager.h → src/storage/dd/cudd/CuddDdManager.h

@@ -5,7 +5,7 @@
 #include <memory>
 
 #include "src/storage/dd/DdManager.h"
-#include "src/storage/dd/CuddDdMetaVariable.h"
+#include "src/storage/dd/cudd/CuddDdMetaVariable.h"
 #include "src/utility/OsDetection.h"
 
 // Include the C++-interface of CUDD.

src/storage/dd/CuddDdMetaVariable.cpp → src/storage/dd/cudd/CuddDdMetaVariable.cpp

@@ -1,5 +1,5 @@
-#include "src/storage/dd/CuddDdMetaVariable.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddDdMetaVariable.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 
 namespace storm {
     namespace dd {

src/storage/dd/CuddDdMetaVariable.h → src/storage/dd/cudd/CuddDdMetaVariable.h

@@ -7,9 +7,9 @@
 #include <string>
 
 #include "utility/OsDetection.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 #include "src/storage/dd/DdMetaVariable.h"
-#include "src/storage/dd/CuddDdForwardIterator.h"
+#include "src/storage/dd/cudd/CuddDdForwardIterator.h"
 
 
 namespace storm {

src/storage/dd/CuddOdd.cpp → src/storage/dd/cudd/CuddOdd.cpp

@@ -1,4 +1,4 @@
-#include "src/storage/dd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
 
 #include <fstream>
 #include <algorithm>
@@ -8,8 +8,8 @@
 #include "src/exceptions/InvalidArgumentException.h"
 #include "src/utility/macros.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddDdMetaVariable.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddDdMetaVariable.h"
 
 namespace storm {
     namespace dd {

src/storage/dd/CuddOdd.h → src/storage/dd/cudd/CuddOdd.h

@@ -5,7 +5,7 @@
 #include <unordered_map>
 
 #include "src/storage/dd/Odd.h"
-#include "src/storage/dd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
 #include "src/utility/OsDetection.h"
 
 // Include the C++-interface of CUDD.

src/utility/graph.cpp

@@ -13,9 +13,9 @@
 #include "src/models/sparse/StandardRewardModel.h"
 #include "src/utility/constants.h"
 #include "src/exceptions/InvalidArgumentException.h"
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 
 #include "log4cplus/logger.h"
 #include "log4cplus/loggingmacros.h"

src/utility/storm.h

@@ -34,8 +34,8 @@
 #include "src/models/symbolic/Model.h"
 #include "src/models/symbolic/StandardRewardModel.h"
 
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 
 #include "src/parser/AutoParser.h"
 

test/functional/builder/DdPrismModelBuilderTest.cpp

@@ -7,9 +7,9 @@
 #include "src/models/symbolic/Ctmc.h"
 #include "src/models/symbolic/Mdp.h"
 #include "src/models/symbolic/StandardRewardModel.h"
-#include "src/storage/dd/CuddDd.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDd.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 #include "src/parser/PrismParser.h"
 #include "src/builder/DdPrismModelBuilder.h"
 

test/functional/solver/FullySymbolicGameSolverTest.cpp

@@ -1,9 +1,9 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
 #include "src/utility/solver.h"
 #include "src/settings/SettingsManager.h"
 

test/functional/storage/CuddDdTest.cpp

@@ -1,9 +1,9 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 #include "src/exceptions/InvalidArgumentException.h"
-#include "src/storage/dd/CuddDdManager.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddOdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddOdd.h"
 #include "src/storage/dd/DdMetaVariable.h"
 #include "src/settings/SettingsManager.h"
 

test/functional/utility/GraphTest.cpp

@@ -1,7 +1,7 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/storage/dd/CuddDd.h"
+#include "src/storage/dd/cudd/CuddDd.h"
 #include "src/parser/PrismParser.h"
 #include "src/models/symbolic/Dtmc.h"
 #include "src/models/symbolic/Mdp.h"
@@ -12,9 +12,9 @@
 #include "src/builder/DdPrismModelBuilder.h"
 #include "src/builder/ExplicitPrismModelBuilder.h"
 #include "src/utility/graph.h"
-#include "src/storage/dd/CuddAdd.h"
-#include "src/storage/dd/CuddBdd.h"
-#include "src/storage/dd/CuddDdManager.h"
+#include "src/storage/dd/cudd/CuddAdd.h"
+#include "src/storage/dd/cudd/CuddBdd.h"
+#include "src/storage/dd/cudd/CuddDdManager.h"
 
 TEST(GraphTest, SymbolicProb01) {
     storm::prism::Program program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/crowds-5-5.pm");