sp
/
tempest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

moved CUDD-based DD implementation to own folder 

Former-commit-id: a828f92518
main
dehnert 10 years ago
parent
7080f954b9
commit
4e86ef2e47
51 changed files with 122 additions and 120 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/CMakeLists.txt
  2. 6
      src/adapters/AddExpressionAdapter.cpp
  3. 8
      src/builder/DdPrismModelBuilder.cpp
  4. 4
      src/modelchecker/csl/HybridCtmcCslModelChecker.cpp
  5. 8
      src/modelchecker/csl/helper/HybridCtmcCslHelper.cpp
  6. 4
      src/modelchecker/prctl/HybridDtmcPrctlModelChecker.cpp
  7. 2
      src/modelchecker/prctl/HybridMdpPrctlModelChecker.cpp
  8. 8
      src/modelchecker/prctl/helper/HybridDtmcPrctlHelper.cpp
  9. 8
      src/modelchecker/prctl/helper/HybridMdpPrctlHelper.cpp
  10. 8
      src/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.cpp
  11. 8
      src/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.cpp
  12. 4
      src/modelchecker/propositional/SymbolicPropositionalModelChecker.cpp
  13. 2
      src/modelchecker/results/CheckResult.cpp
  14. 2
      src/modelchecker/results/HybridQuantitativeCheckResult.cpp
  15. 6
      src/modelchecker/results/HybridQuantitativeCheckResult.h
  16. 2
      src/modelchecker/results/SymbolicQualitativeCheckResult.cpp
  17. 2
      src/modelchecker/results/SymbolicQualitativeCheckResult.h
  18. 4
      src/modelchecker/results/SymbolicQuantitativeCheckResult.cpp
  19. 2
      src/modelchecker/results/SymbolicQuantitativeCheckResult.h
  20. 6
      src/models/symbolic/Ctmc.cpp
  21. 6
      src/models/symbolic/DeterministicModel.cpp
  22. 6
      src/models/symbolic/Dtmc.cpp
  23. 6
      src/models/symbolic/Mdp.cpp
  24. 6
      src/models/symbolic/Model.cpp
  25. 6
      src/models/symbolic/NondeterministicModel.cpp
  26. 6
      src/models/symbolic/StandardRewardModel.cpp
  27. 6
      src/models/symbolic/StochasticTwoPlayerGame.cpp
  28. 4
      src/solver/SymbolicGameSolver.cpp
  29. 4
      src/solver/SymbolicLinearEquationSolver.cpp
  30. 4
      src/solver/SymbolicMinMaxLinearEquationSolver.cpp
  31. 2
      src/solver/SymbolicMinMaxLinearEquationSolver.h
  32. 8
      src/storage/dd/cudd/CuddAdd.cpp
  33. 4
      src/storage/dd/cudd/CuddAdd.h
  34. 8
      src/storage/dd/cudd/CuddBdd.cpp
  35. 2
      src/storage/dd/cudd/CuddBdd.h
  36. 4
      src/storage/dd/cudd/CuddDd.cpp
  37. 0
      src/storage/dd/cudd/CuddDd.h
  38. 4
      src/storage/dd/cudd/CuddDdForwardIterator.cpp
  39. 0
      src/storage/dd/cudd/CuddDdForwardIterator.h
  40. 4
      src/storage/dd/cudd/CuddDdManager.cpp
  41. 2
      src/storage/dd/cudd/CuddDdManager.h
  42. 4
      src/storage/dd/cudd/CuddDdMetaVariable.cpp
  43. 4
      src/storage/dd/cudd/CuddDdMetaVariable.h
  44. 6
      src/storage/dd/cudd/CuddOdd.cpp
  45. 2
      src/storage/dd/cudd/CuddOdd.h
  46. 6
      src/utility/graph.cpp
  47. 4
      src/utility/storm.h
  48. 6
      test/functional/builder/DdPrismModelBuilderTest.cpp
  49. 6
      test/functional/solver/FullySymbolicGameSolverTest.cpp
  50. 6
      test/functional/storage/CuddDdTest.cpp
  51. 8
      test/functional/utility/GraphTest.cpp

4
src/CMakeLists.txt
View File

@ -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_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_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 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_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_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) 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 FILES ${STORM_STORAGE_FILES})
source_group(storage\\bisimulation FILES ${STORM_STORAGE_BISIMULATION_FILES}) source_group(storage\\bisimulation FILES ${STORM_STORAGE_BISIMULATION_FILES})
source_group(storage\\dd FILES ${STORM_STORAGE_DD_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\\expressions FILES ${STORM_STORAGE_EXPRESSIONS_FILES})
source_group(storage\\prism FILES ${STORM_STORAGE_PRISM_FILES}) source_group(storage\\prism FILES ${STORM_STORAGE_PRISM_FILES})
source_group(storage\\sparse FILES ${STORM_STORAGE_SPARSE_FILES}) source_group(storage\\sparse FILES ${STORM_STORAGE_SPARSE_FILES})

6
src/adapters/AddExpressionAdapter.cpp
View File

@ -4,9 +4,9 @@
#include "src/exceptions/ExpressionEvaluationException.h" #include "src/exceptions/ExpressionEvaluationException.h"
#include "src/exceptions/InvalidArgumentException.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 { namespace storm {

8
src/builder/DdPrismModelBuilder.cpp
View File

@ -5,8 +5,8 @@
#include "src/models/symbolic/Mdp.h" #include "src/models/symbolic/Mdp.h"
#include "src/models/symbolic/StandardRewardModel.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/settings/SettingsManager.h"
#include "src/exceptions/InvalidStateException.h" #include "src/exceptions/InvalidStateException.h"
@ -17,8 +17,8 @@
#include "src/utility/math.h" #include "src/utility/math.h"
#include "src/storage/prism/Program.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" #include "src/settings/modules/GeneralSettings.h"

4
src/modelchecker/csl/HybridCtmcCslModelChecker.cpp
View File

@ -7,8 +7,8 @@
#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h" #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 storm {
namespace modelchecker { namespace modelchecker {

8
src/modelchecker/csl/helper/HybridCtmcCslHelper.cpp
View File

@ -3,10 +3,10 @@
#include "src/modelchecker/csl/helper/SparseCtmcCslHelper.h" #include "src/modelchecker/csl/helper/SparseCtmcCslHelper.h"
#include "src/modelchecker/prctl/helper/HybridDtmcPrctlHelper.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/macros.h"
#include "src/utility/graph.h" #include "src/utility/graph.h"

4
src/modelchecker/prctl/HybridDtmcPrctlModelChecker.cpp
View File

@ -3,8 +3,8 @@
#include "src/modelchecker/prctl/helper/HybridDtmcPrctlHelper.h" #include "src/modelchecker/prctl/helper/HybridDtmcPrctlHelper.h"
#include "src/modelchecker/prctl/helper/SparseDtmcPrctlHelper.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/macros.h"
#include "src/utility/graph.h" #include "src/utility/graph.h"

2
src/modelchecker/prctl/HybridMdpPrctlModelChecker.cpp
View File

@ -2,7 +2,7 @@
#include "src/modelchecker/prctl/helper/HybridMdpPrctlHelper.h" #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/Mdp.h"
#include "src/models/symbolic/StandardRewardModel.h" #include "src/models/symbolic/StandardRewardModel.h"

8
src/modelchecker/prctl/helper/HybridDtmcPrctlHelper.cpp
View File

@ -3,10 +3,10 @@
#include "src/solver/LinearEquationSolver.h" #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/graph.h"
#include "src/utility/constants.h" #include "src/utility/constants.h"

8
src/modelchecker/prctl/helper/HybridMdpPrctlHelper.cpp
View File

@ -1,9 +1,9 @@
#include "src/modelchecker/prctl/helper/HybridMdpPrctlHelper.h" #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/graph.h"
#include "src/utility/constants.h" #include "src/utility/constants.h"

8
src/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.cpp
View File

@ -1,10 +1,10 @@
#include "src/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.h" #include "src/modelchecker/prctl/helper/SymbolicDtmcPrctlHelper.h"
#include "src/storage/dd/DdType.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" #include "src/solver/SymbolicLinearEquationSolver.h"

8
src/modelchecker/prctl/helper/SymbolicMdpPrctlHelper.cpp
View File

@ -2,10 +2,10 @@
#include "src/solver/SymbolicMinMaxLinearEquationSolver.h" #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/graph.h"
#include "src/utility/constants.h" #include "src/utility/constants.h"

4
src/modelchecker/propositional/SymbolicPropositionalModelChecker.cpp
View File

@ -1,7 +1,7 @@
#include "src/modelchecker/propositional/SymbolicPropositionalModelChecker.h" #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/Dtmc.h"
#include "src/models/symbolic/Ctmc.h" #include "src/models/symbolic/Ctmc.h"

2
src/modelchecker/results/CheckResult.cpp
View File

@ -3,7 +3,7 @@
#include "storm-config.h" #include "storm-config.h"
#include "src/adapters/CarlAdapter.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/ExplicitQualitativeCheckResult.h"
#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h" #include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h" #include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"

2
src/modelchecker/results/HybridQuantitativeCheckResult.cpp
View File

@ -1,7 +1,7 @@
#include "src/modelchecker/results/HybridQuantitativeCheckResult.h" #include "src/modelchecker/results/HybridQuantitativeCheckResult.h"
#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h" #include "src/modelchecker/results/SymbolicQualitativeCheckResult.h"
#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.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/exceptions/InvalidOperationException.h"
#include "src/utility/macros.h" #include "src/utility/macros.h"

6
src/modelchecker/results/HybridQuantitativeCheckResult.h
View File

@ -2,9 +2,9 @@
#define STORM_MODELCHECKER_HYBRIDQUANTITATIVECHECKRESULT_H_ #define STORM_MODELCHECKER_HYBRIDQUANTITATIVECHECKRESULT_H_
#include "src/storage/dd/DdType.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/modelchecker/results/QuantitativeCheckResult.h"
#include "src/utility/OsDetection.h" #include "src/utility/OsDetection.h"

2
src/modelchecker/results/SymbolicQualitativeCheckResult.cpp
View File

@ -1,6 +1,6 @@
#include "src/modelchecker/results/SymbolicQualitativeCheckResult.h" #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/utility/macros.h"
#include "src/exceptions/InvalidOperationException.h" #include "src/exceptions/InvalidOperationException.h"

2
src/modelchecker/results/SymbolicQualitativeCheckResult.h
View File

@ -2,7 +2,7 @@
#define STORM_MODELCHECKER_SYMBOLICQUALITATIVECHECKRESULT_H_ #define STORM_MODELCHECKER_SYMBOLICQUALITATIVECHECKRESULT_H_
#include "src/storage/dd/DdType.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/modelchecker/results/QualitativeCheckResult.h"
#include "src/utility/OsDetection.h" #include "src/utility/OsDetection.h"

4
src/modelchecker/results/SymbolicQuantitativeCheckResult.cpp
View File

@ -1,8 +1,8 @@
#include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h" #include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h"
#include "src/modelchecker/results/SymbolicQualitativeCheckResult.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/exceptions/InvalidOperationException.h"
#include "src/utility/macros.h" #include "src/utility/macros.h"
#include "src/utility/constants.h" #include "src/utility/constants.h"

2
src/modelchecker/results/SymbolicQuantitativeCheckResult.h
View File

@ -2,7 +2,7 @@
#define STORM_MODELCHECKER_SYMBOLICQUANTITATIVECHECKRESULT_H_ #define STORM_MODELCHECKER_SYMBOLICQUANTITATIVECHECKRESULT_H_
#include "src/storage/dd/DdType.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/modelchecker/results/QuantitativeCheckResult.h"
#include "src/utility/OsDetection.h" #include "src/utility/OsDetection.h"

6
src/models/symbolic/Ctmc.cpp
View File

@ -1,8 +1,8 @@
#include "src/models/symbolic/Ctmc.h" #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" #include "src/models/symbolic/StandardRewardModel.h"

6
src/models/symbolic/DeterministicModel.cpp
View File

@ -1,8 +1,8 @@
#include "src/models/symbolic/DeterministicModel.h" #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" #include "src/models/symbolic/StandardRewardModel.h"

6
src/models/symbolic/Dtmc.cpp
View File

@ -1,8 +1,8 @@
#include "src/models/symbolic/Dtmc.h" #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" #include "src/models/symbolic/StandardRewardModel.h"

6
src/models/symbolic/Mdp.cpp
View File

@ -1,8 +1,8 @@
#include "src/models/symbolic/Mdp.h" #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" #include "src/models/symbolic/StandardRewardModel.h"

6
src/models/symbolic/Model.cpp
View File

@ -7,9 +7,9 @@
#include "src/adapters/AddExpressionAdapter.h" #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" #include "src/models/symbolic/StandardRewardModel.h"

6
src/models/symbolic/NondeterministicModel.cpp
View File

@ -1,8 +1,8 @@
#include "src/models/symbolic/NondeterministicModel.h" #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" #include "src/models/symbolic/StandardRewardModel.h"

6
src/models/symbolic/StandardRewardModel.cpp
View File

@ -1,8 +1,8 @@
#include "src/models/symbolic/StandardRewardModel.h" #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 storm {
namespace models { namespace models {

6
src/models/symbolic/StochasticTwoPlayerGame.cpp
View File

@ -1,8 +1,8 @@
#include "src/models/symbolic/StochasticTwoPlayerGame.h" #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" #include "src/models/symbolic/StandardRewardModel.h"

4
src/solver/SymbolicGameSolver.cpp
View File

@ -1,7 +1,7 @@
#include "src/solver/SymbolicGameSolver.h" #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/SettingsManager.h"
#include "src/settings/modules/NativeEquationSolverSettings.h" #include "src/settings/modules/NativeEquationSolverSettings.h"

4
src/solver/SymbolicLinearEquationSolver.cpp
View File

@ -1,7 +1,7 @@
#include "src/solver/SymbolicLinearEquationSolver.h" #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" #include "src/storage/dd/Add.h"

4
src/solver/SymbolicMinMaxLinearEquationSolver.cpp
View File

@ -1,7 +1,7 @@
#include "src/solver/SymbolicMinMaxLinearEquationSolver.h" #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" #include "src/storage/dd/Add.h"

2
src/solver/SymbolicMinMaxLinearEquationSolver.h
View File

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

8
src/storage/dd/CuddAdd.cpp → src/storage/dd/cudd/CuddAdd.cpp
View File

@ -2,10 +2,10 @@
#include <algorithm> #include <algorithm>
#include <boost/algorithm/string/join.hpp> #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/vector.h"
#include "src/utility/macros.h" #include "src/utility/macros.h"

4
src/storage/dd/CuddAdd.h → src/storage/dd/cudd/CuddAdd.h
View File

@ -5,8 +5,8 @@
#include <map> #include <map>
#include "src/storage/dd/Add.h" #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/storage/expressions/Variable.h"
#include "src/utility/OsDetection.h" #include "src/utility/OsDetection.h"

8
src/storage/dd/CuddBdd.cpp → src/storage/dd/cudd/CuddBdd.cpp
View File

@ -2,10 +2,10 @@
#include <algorithm> #include <algorithm>
#include <functional> #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" #include "src/storage/BitVector.h"

2
src/storage/dd/CuddBdd.h → src/storage/dd/cudd/CuddBdd.h
View File

@ -2,7 +2,7 @@
#define STORM_STORAGE_DD_CUDDBDD_H_ #define STORM_STORAGE_DD_CUDDBDD_H_
#include "src/storage/dd/Bdd.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 "src/utility/OsDetection.h"
// Include the C++-interface of CUDD. // Include the C++-interface of CUDD.

4
src/storage/dd/CuddDd.cpp → src/storage/dd/cudd/CuddDd.cpp
View File

@ -1,7 +1,7 @@
#include <algorithm> #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 storm {
namespace dd { namespace dd {

0
src/storage/dd/CuddDd.h → src/storage/dd/cudd/CuddDd.h
View File

4
src/storage/dd/CuddDdForwardIterator.cpp → src/storage/dd/cudd/CuddDdForwardIterator.cpp
View File

@ -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/storage/dd/DdMetaVariable.h"
#include "src/utility/macros.h" #include "src/utility/macros.h"
#include "src/storage/expressions/ExpressionManager.h" #include "src/storage/expressions/ExpressionManager.h"

0
src/storage/dd/CuddDdForwardIterator.h → src/storage/dd/cudd/CuddDdForwardIterator.h
View File

4
src/storage/dd/CuddDdManager.cpp → src/storage/dd/cudd/CuddDdManager.cpp
View File

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

2
src/storage/dd/CuddDdManager.h → src/storage/dd/cudd/CuddDdManager.h
View File

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

4
src/storage/dd/CuddDdMetaVariable.cpp → src/storage/dd/cudd/CuddDdMetaVariable.cpp
View File

@ -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 storm {
namespace dd { namespace dd {

4
src/storage/dd/CuddDdMetaVariable.h → src/storage/dd/cudd/CuddDdMetaVariable.h
View File

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

6
src/storage/dd/CuddOdd.cpp → src/storage/dd/cudd/CuddOdd.cpp
View File

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

2
src/storage/dd/CuddOdd.h → src/storage/dd/cudd/CuddOdd.h
View File

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

6
src/utility/graph.cpp
View File

@ -13,9 +13,9 @@
#include "src/models/sparse/StandardRewardModel.h" #include "src/models/sparse/StandardRewardModel.h"
#include "src/utility/constants.h" #include "src/utility/constants.h"
#include "src/exceptions/InvalidArgumentException.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/logger.h"
#include "log4cplus/loggingmacros.h" #include "log4cplus/loggingmacros.h"

4
src/utility/storm.h
View File

@ -34,8 +34,8 @@
#include "src/models/symbolic/Model.h" #include "src/models/symbolic/Model.h"
#include "src/models/symbolic/StandardRewardModel.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" #include "src/parser/AutoParser.h"

6
test/functional/builder/DdPrismModelBuilderTest.cpp
View File

@ -7,9 +7,9 @@
#include "src/models/symbolic/Ctmc.h" #include "src/models/symbolic/Ctmc.h"
#include "src/models/symbolic/Mdp.h" #include "src/models/symbolic/Mdp.h"
#include "src/models/symbolic/StandardRewardModel.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/parser/PrismParser.h"
#include "src/builder/DdPrismModelBuilder.h" #include "src/builder/DdPrismModelBuilder.h"

6
test/functional/solver/FullySymbolicGameSolverTest.cpp
View File

@ -1,9 +1,9 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "storm-config.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/utility/solver.h"
#include "src/settings/SettingsManager.h" #include "src/settings/SettingsManager.h"

6
test/functional/storage/CuddDdTest.cpp
View File

@ -1,9 +1,9 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "storm-config.h" #include "storm-config.h"
#include "src/exceptions/InvalidArgumentException.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/storage/dd/DdMetaVariable.h"
#include "src/settings/SettingsManager.h" #include "src/settings/SettingsManager.h"

8
test/functional/utility/GraphTest.cpp
View File

@ -1,7 +1,7 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "storm-config.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/parser/PrismParser.h"
#include "src/models/symbolic/Dtmc.h" #include "src/models/symbolic/Dtmc.h"
#include "src/models/symbolic/Mdp.h" #include "src/models/symbolic/Mdp.h"
@ -12,9 +12,9 @@
#include "src/builder/DdPrismModelBuilder.h" #include "src/builder/DdPrismModelBuilder.h"
#include "src/builder/ExplicitPrismModelBuilder.h" #include "src/builder/ExplicitPrismModelBuilder.h"
#include "src/utility/graph.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) { TEST(GraphTest, SymbolicProb01) {
storm::prism::Program program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/crowds-5-5.pm"); storm::prism::Program program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/crowds-5-5.pm");

Write Preview
Loading…
Cancel
Save