Browse Source

c++ code compiles again after rename

main
Sebastian Junges 9 years ago
parent
commit
e1d201c85e
  1. 6
      CMakeLists.txt
  2. 2
      cuda/CMakeAlignmentCheck.cpp
  3. 2
      cuda/CMakeFloatAlignmentCheck.cpp
  4. 1
      src/CMakeLists.txt
  5. 18
      src/storm/CMakeLists.txt
  6. 14
      src/storm/adapters/AddExpressionAdapter.cpp
  7. 12
      src/storm/adapters/AddExpressionAdapter.h
  8. 2
      src/storm/adapters/EigenAdapter.cpp
  9. 6
      src/storm/adapters/EigenAdapter.h
  10. 6
      src/storm/adapters/GmmxxAdapter.h
  11. 4
      src/storm/adapters/HyproAdapter.h
  12. 2
      src/storm/adapters/MathsatExpressionAdapter.cpp
  13. 10
      src/storm/adapters/MathsatExpressionAdapter.h
  14. 16
      src/storm/adapters/Smt2ExpressionAdapter.h
  15. 2
      src/storm/adapters/XercesAdapter.h
  16. 14
      src/storm/adapters/Z3ExpressionAdapter.cpp
  17. 4
      src/storm/adapters/Z3ExpressionAdapter.h
  18. 12
      src/storm/builder/BuilderOptions.cpp
  19. 2
      src/storm/builder/BuilderOptions.h
  20. 50
      src/storm/builder/DdJaniModelBuilder.cpp
  21. 6
      src/storm/builder/DdJaniModelBuilder.h
  22. 38
      src/storm/builder/DdPrismModelBuilder.cpp
  23. 8
      src/storm/builder/DdPrismModelBuilder.h
  24. 10
      src/storm/builder/DftExplorationHeuristic.cpp
  25. 4
      src/storm/builder/DftSmtBuilder.cpp
  26. 6
      src/storm/builder/DftSmtBuilder.h
  27. 16
      src/storm/builder/ExplicitDFTModelBuilder.cpp
  28. 14
      src/storm/builder/ExplicitDFTModelBuilder.h
  29. 18
      src/storm/builder/ExplicitDFTModelBuilderApprox.cpp
  30. 20
      src/storm/builder/ExplicitDFTModelBuilderApprox.h
  31. 14
      src/storm/builder/ExplicitGspnModelBuilder.cpp
  32. 14
      src/storm/builder/ExplicitGspnModelBuilder.h
  33. 38
      src/storm/builder/ExplicitModelBuilder.cpp
  34. 34
      src/storm/builder/ExplicitModelBuilder.h
  35. 4
      src/storm/builder/ExplorationOrder.cpp
  36. 2
      src/storm/builder/ExplorationOrder.h
  37. 8
      src/storm/builder/JaniGSPNBuilder.h
  38. 2
      src/storm/builder/JaniProgramGraphBuilder.cpp
  39. 16
      src/storm/builder/JaniProgramGraphBuilder.h
  40. 6
      src/storm/builder/ParallelCompositionBuilder.cpp
  41. 2
      src/storm/builder/ParallelCompositionBuilder.h
  42. 14
      src/storm/builder/ProgramGraphBuilder.cpp
  43. 10
      src/storm/builder/ProgramGraphBuilder.h
  44. 10
      src/storm/builder/RewardModelBuilder.cpp
  45. 2
      src/storm/builder/RewardModelBuilder.h
  46. 2
      src/storm/builder/RewardModelInformation.cpp
  47. 6
      src/storm/builder/jit/Choice.cpp
  48. 2
      src/storm/builder/jit/Choice.h
  49. 4
      src/storm/builder/jit/Distribution.cpp
  50. 2
      src/storm/builder/jit/Distribution.h
  51. 4
      src/storm/builder/jit/DistributionEntry.cpp
  52. 58
      src/storm/builder/jit/ExplicitJitJaniModelBuilder.cpp
  53. 14
      src/storm/builder/jit/ExplicitJitJaniModelBuilder.h
  54. 4
      src/storm/builder/jit/JitModelBuilderInterface.cpp
  55. 2
      src/storm/builder/jit/JitModelBuilderInterface.h
  56. 26
      src/storm/builder/jit/ModelComponentsBuilder.cpp
  57. 4
      src/storm/builder/jit/ModelComponentsBuilder.h
  58. 6
      src/storm/builder/jit/StateBehaviour.cpp
  59. 4
      src/storm/builder/jit/StateBehaviour.h
  60. 16
      src/storm/cli/cli.cpp
  61. 12
      src/storm/cli/entrypoints.h
  62. 34
      src/storm/counterexamples/MILPMinimalLabelSetGenerator.h
  63. 18
      src/storm/counterexamples/SMTMinimalCommandSetGenerator.h
  64. 4
      src/storm/exceptions/ArgumentUnificationException.h
  65. 4
      src/storm/exceptions/BaseException.cpp
  66. 2
      src/storm/exceptions/BaseException.h
  67. 4
      src/storm/exceptions/ExpressionEvaluationException.h
  68. 4
      src/storm/exceptions/FileIoException.h
  69. 4
      src/storm/exceptions/IllegalArgumentException.h
  70. 4
      src/storm/exceptions/IllegalArgumentTypeException.h
  71. 4
      src/storm/exceptions/IllegalArgumentValueException.h
  72. 4
      src/storm/exceptions/IllegalFunctionCallException.h
  73. 4
      src/storm/exceptions/InternalTypeErrorException.h
  74. 4
      src/storm/exceptions/InvalidAccessException.h
  75. 4
      src/storm/exceptions/InvalidArgumentException.h
  76. 4
      src/storm/exceptions/InvalidJaniException.h
  77. 4
      src/storm/exceptions/InvalidOperationException.h
  78. 4
      src/storm/exceptions/InvalidOptionException.h
  79. 4
      src/storm/exceptions/InvalidPropertyException.h
  80. 4
      src/storm/exceptions/InvalidSettingsException.h
  81. 4
      src/storm/exceptions/InvalidStateException.h
  82. 4
      src/storm/exceptions/InvalidTypeException.h
  83. 4
      src/storm/exceptions/NoConvergenceException.h
  84. 4
      src/storm/exceptions/NotImplementedException.h
  85. 4
      src/storm/exceptions/NotSupportedException.h
  86. 4
      src/storm/exceptions/OptionParserException.h
  87. 4
      src/storm/exceptions/OptionUnificationException.h
  88. 4
      src/storm/exceptions/OutOfRangeException.h
  89. 4
      src/storm/exceptions/UnexpectedException.h
  90. 4
      src/storm/exceptions/UnsupportedModelException.h
  91. 4
      src/storm/exceptions/WrongFormatException.h
  92. 10
      src/storm/generator/Choice.cpp
  93. 2
      src/storm/generator/Choice.h
  94. 10
      src/storm/generator/CompressedState.cpp
  95. 2
      src/storm/generator/CompressedState.h
  96. 8
      src/storm/generator/DftNextStateGenerator.cpp
  97. 6
      src/storm/generator/DftNextStateGenerator.h
  98. 20
      src/storm/generator/JaniNextStateGenerator.cpp
  99. 4
      src/storm/generator/JaniNextStateGenerator.h
  100. 16
      src/storm/generator/NextStateGenerator.cpp

6
CMakeLists.txt

@ -6,7 +6,7 @@ project (storm CXX C)
# Add base folder for better inclusion paths
include_directories("${PROJECT_SOURCE_DIR}")
include_directories("${PROJECT_SOURCE_DIR}/src")
include_directories("${PROJECT_SOURCE_DIR}/src/storm")
# Add the resources/cmake folder to Module Search Path for FindTBB.cmake
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/resources/cmake/find_modules" "${PROJECT_SOURCE_DIR}/resources/cmake/macros")
@ -322,10 +322,10 @@ configure_file (
# Configure a header file to pass the storm version to the source code
configure_file (
"${PROJECT_SOURCE_DIR}/storm-version.cpp.in"
"${PROJECT_SOURCE_DIR}/src/utility/storm-version.cpp"
"${PROJECT_SOURCE_DIR}/src/storm/utility/storm-version.cpp"
)
set(STORM_GENERATED_SOURCES "${PROJECT_BINARY_DIR}/src/utility/storm-version.cpp")
set(STORM_GENERATED_SOURCES "${PROJECT_BINARY_DIR}/src/storm/utility/storm-version.cpp")
# Add the binary dir include directory for storm-config.h
include_directories("${PROJECT_BINARY_DIR}/include")

2
cuda/CMakeAlignmentCheck.cpp

@ -61,4 +61,4 @@
}
return 0;
}
}

2
cuda/CMakeFloatAlignmentCheck.cpp

@ -28,4 +28,4 @@ int main(int argc, char* argv[]) {
}
return result;
}
}

1
src/CMakeLists.txt

@ -0,0 +1 @@
add_subdirectory(storm)

18
src/storm/CMakeLists.txt

@ -3,14 +3,14 @@
## Source file aggregation and clustering
##
#############################################################
file(GLOB_RECURSE STORM_HEADERS ${PROJECT_SOURCE_DIR}/src/*.h)
file(GLOB_RECURSE STORM_HEADERS_CLI ${PROJECT_SOURCE_DIR}/src/cli/*.h)
file(GLOB_RECURSE STORM_SOURCES_WITHOUT_MAIN ${PROJECT_SOURCE_DIR}/src/*/*.cpp)
file(GLOB_RECURSE STORM_SOURCES_CLI ${PROJECT_SOURCE_DIR}/src/cli/*.cpp)
file(GLOB_RECURSE STORM_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm.cpp)
file(GLOB_RECURSE STORM_DFT_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm-dyftee.cpp)
file(GLOB_RECURSE STORM_PGCL_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm-pgcl.cpp)
file(GLOB_RECURSE STORM_GSPN_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm-gspn.cpp)
file(GLOB_RECURSE STORM_HEADERS ${PROJECT_SOURCE_DIR}/src/storm/*.h)
file(GLOB_RECURSE STORM_HEADERS_CLI ${PROJECT_SOURCE_DIR}/src/storm/cli/*.h)
file(GLOB_RECURSE STORM_SOURCES_WITHOUT_MAIN ${PROJECT_SOURCE_DIR}/src/storm/*/*.cpp)
file(GLOB_RECURSE STORM_SOURCES_CLI ${PROJECT_SOURCE_DIR}/src/storm/cli/*.cpp)
file(GLOB_RECURSE STORM_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm/storm.cpp)
file(GLOB_RECURSE STORM_DFT_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm/storm-dyftee.cpp)
file(GLOB_RECURSE STORM_PGCL_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm/storm-pgcl.cpp)
file(GLOB_RECURSE STORM_GSPN_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm/storm-gspn.cpp)
# Additional include files like the storm-config.h
file(GLOB_RECURSE STORM_BUILD_HEADERS ${PROJECT_BINARY_DIR}/include/*.h)
@ -25,7 +25,7 @@ set(STORM_PGCL_MAIN_SOURCES ${STORM_SOURCES_CLI} ${STORM_PGCL_MAIN_FILE})
set(STORM_GSPN_MAIN_SOURCES ${STORM_SOURCES_CLI} ${STORM_GSPN_MAIN_FILE})
set(STORM_MAIN_HEADERS ${STORM_HEADERS_CLI})
file(GLOB_RECURSE ALL_FILES ${PROJECT_SOURCE_DIR}/src/*.h ${PROJECT_SOURCE_DIR}/src/*.cpp)
file(GLOB_RECURSE ALL_FILES ${PROJECT_SOURCE_DIR}/src/storm/*.h ${PROJECT_SOURCE_DIR}/src/storm/*.cpp)
register_source_groups_from_filestructure("${ALL_FILES}")

14
src/storm/adapters/AddExpressionAdapter.cpp

@ -1,12 +1,12 @@
#include "src/adapters/AddExpressionAdapter.h"
#include "src/storm/adapters/AddExpressionAdapter.h"
#include "src/utility/macros.h"
#include "src/exceptions/ExpressionEvaluationException.h"
#include "src/exceptions/InvalidArgumentException.h"
#include "src/storm/utility/macros.h"
#include "src/storm/exceptions/ExpressionEvaluationException.h"
#include "src/storm/exceptions/InvalidArgumentException.h"
#include "src/storage/dd/DdManager.h"
#include "src/storage/dd/Add.h"
#include "src/storage/dd/Bdd.h"
#include "src/storm/storage/dd/DdManager.h"
#include "src/storm/storage/dd/Add.h"
#include "src/storm/storage/dd/Bdd.h"
namespace storm {
namespace adapters {

12
src/storm/adapters/AddExpressionAdapter.h

@ -3,13 +3,13 @@
#include <memory>
#include "src/storage/expressions/Variable.h"
#include "src/storage/expressions/Expressions.h"
#include "src/storage/expressions/ExpressionVisitor.h"
#include "src/storm/storage/expressions/Variable.h"
#include "src/storm/storage/expressions/Expressions.h"
#include "src/storm/storage/expressions/ExpressionVisitor.h"
#include "src/storage/dd/Add.h"
#include "src/storage/dd/Bdd.h"
#include "src/storage/dd/DdManager.h"
#include "src/storm/storage/dd/Add.h"
#include "src/storm/storage/dd/Bdd.h"
#include "src/storm/storage/dd/DdManager.h"
namespace storm {
namespace adapters {

2
src/storm/adapters/EigenAdapter.cpp

@ -1,4 +1,4 @@
#include "src/adapters/EigenAdapter.h"
#include "src/storm/adapters/EigenAdapter.h"
namespace storm {
namespace adapters {

6
src/storm/adapters/EigenAdapter.h

@ -2,9 +2,9 @@
#include <memory>
#include "src/utility/eigen.h"
#include "src/storm/utility/eigen.h"
#include "src/storage/SparseMatrix.h"
#include "src/storm/storage/SparseMatrix.h"
namespace storm {
namespace adapters {
@ -20,4 +20,4 @@ namespace storm {
};
}
}
}

6
src/storm/adapters/GmmxxAdapter.h

@ -4,11 +4,11 @@
#include <algorithm>
#include <memory>
#include "src/utility/gmm.h"
#include "src/storm/utility/gmm.h"
#include "src/storage/SparseMatrix.h"
#include "src/storm/storage/SparseMatrix.h"
#include "src/utility/macros.h"
#include "src/storm/utility/macros.h"
namespace storm {

4
src/storm/adapters/HyproAdapter.h

@ -11,8 +11,8 @@
#include <hypro/representations/GeometricObject.h>
#include <hypro/representations/Polytopes/HPolytope/HPolytope.h>
#include "src/adapters/CarlAdapter.h"
#include "src/storage/geometry/HalfSpace.h"
#include "src/storm/adapters/CarlAdapter.h"
#include "src/storm/storage/geometry/HalfSpace.h"
namespace storm {
namespace adapters {

2
src/storm/adapters/MathsatExpressionAdapter.cpp

@ -1,4 +1,4 @@
#include "src/adapters/MathsatExpressionAdapter.h"
#include "src/storm/adapters/MathsatExpressionAdapter.h"
#ifdef STORM_HAVE_MSAT
bool operator==(msat_decl decl1, msat_decl decl2) {

10
src/storm/adapters/MathsatExpressionAdapter.h

@ -12,11 +12,11 @@
#include "storage/expressions/ExpressionManager.h"
#include "storage/expressions/Expressions.h"
#include "storage/expressions/ExpressionVisitor.h"
#include "src/utility/macros.h"
#include "src/exceptions/ExpressionEvaluationException.h"
#include "src/exceptions/InvalidTypeException.h"
#include "src/exceptions/InvalidArgumentException.h"
#include "src/exceptions/NotImplementedException.h"
#include "src/storm/utility/macros.h"
#include "src/storm/exceptions/ExpressionEvaluationException.h"
#include "src/storm/exceptions/InvalidTypeException.h"
#include "src/storm/exceptions/InvalidArgumentException.h"
#include "src/storm/exceptions/NotImplementedException.h"
#ifdef STORM_HAVE_MSAT
namespace std {

16
src/storm/adapters/Smt2ExpressionAdapter.h

@ -4,14 +4,14 @@
#include <unordered_map>
#include "storm-config.h"
#include "src/adapters/CarlAdapter.h"
#include "src/storage/expressions/Expressions.h"
#include "src/storage/expressions/ExpressionManager.h"
#include "src/utility/macros.h"
#include "src/exceptions/ExpressionEvaluationException.h"
#include "src/exceptions/InvalidTypeException.h"
#include "src/exceptions/InvalidArgumentException.h"
#include "src/exceptions/NotImplementedException.h"
#include "src/storm/adapters/CarlAdapter.h"
#include "src/storm/storage/expressions/Expressions.h"
#include "src/storm/storage/expressions/ExpressionManager.h"
#include "src/storm/utility/macros.h"
#include "src/storm/exceptions/ExpressionEvaluationException.h"
#include "src/storm/exceptions/InvalidTypeException.h"
#include "src/storm/exceptions/InvalidArgumentException.h"
#include "src/storm/exceptions/NotImplementedException.h"
namespace storm {
namespace adapters {

2
src/storm/adapters/XercesAdapter.h

@ -41,4 +41,4 @@ namespace storm {
}
}
}
#endif
#endif

14
src/storm/adapters/Z3ExpressionAdapter.cpp

@ -1,11 +1,11 @@
#include "src/adapters/Z3ExpressionAdapter.h"
#include "src/storm/adapters/Z3ExpressionAdapter.h"
#include "src/storage/expressions/Expressions.h"
#include "src/storage/expressions/ExpressionManager.h"
#include "src/utility/macros.h"
#include "src/exceptions/ExpressionEvaluationException.h"
#include "src/exceptions/InvalidTypeException.h"
#include "src/exceptions/NotImplementedException.h"
#include "src/storm/storage/expressions/Expressions.h"
#include "src/storm/storage/expressions/ExpressionManager.h"
#include "src/storm/utility/macros.h"
#include "src/storm/exceptions/ExpressionEvaluationException.h"
#include "src/storm/exceptions/InvalidTypeException.h"
#include "src/storm/exceptions/NotImplementedException.h"
namespace storm {
namespace adapters {

4
src/storm/adapters/Z3ExpressionAdapter.h

@ -12,8 +12,8 @@
#include "z3.h"
#endif
#include "src/storage/expressions/Variable.h"
#include "src/storage/expressions/ExpressionVisitor.h"
#include "src/storm/storage/expressions/Variable.h"
#include "src/storm/storage/expressions/ExpressionVisitor.h"
namespace storm {
namespace adapters {

12
src/storm/builder/BuilderOptions.cpp

@ -1,12 +1,12 @@
#include "src/builder/BuilderOptions.h"
#include "src/storm/builder/BuilderOptions.h"
#include "src/logic/Formulas.h"
#include "src/storm/logic/Formulas.h"
#include "src/settings/SettingsManager.h"
#include "src/settings/modules/IOSettings.h"
#include "src/storm/settings/SettingsManager.h"
#include "src/storm/settings/modules/IOSettings.h"
#include "src/utility/macros.h"
#include "src/exceptions/InvalidSettingsException.h"
#include "src/storm/utility/macros.h"
#include "src/storm/exceptions/InvalidSettingsException.h"
namespace storm {
namespace builder {

2
src/storm/builder/BuilderOptions.h

@ -7,7 +7,7 @@
#include <boost/variant.hpp>
#include <boost/optional.hpp>
#include "src/storage/expressions/Expression.h"
#include "src/storm/storage/expressions/Expression.h"
namespace storm {
namespace expressions {

50
src/storm/builder/DdJaniModelBuilder.cpp

@ -1,39 +1,39 @@
#include "src/builder/DdJaniModelBuilder.h"
#include "src/storm/builder/DdJaniModelBuilder.h"
#include <sstream>
#include <boost/algorithm/string/join.hpp>
#include "src/logic/Formulas.h"
#include "src/storm/logic/Formulas.h"
#include "src/storage/jani/Model.h"
#include "src/storage/jani/AutomatonComposition.h"
#include "src/storage/jani/ParallelComposition.h"
#include "src/storage/jani/CompositionInformationVisitor.h"
#include "src/storm/storage/jani/Model.h"
#include "src/storm/storage/jani/AutomatonComposition.h"
#include "src/storm/storage/jani/ParallelComposition.h"
#include "src/storm/storage/jani/CompositionInformationVisitor.h"
#include "src/storage/dd/Add.h"
#include "src/storage/dd/Bdd.h"
#include "src/adapters/AddExpressionAdapter.h"
#include "src/storm/storage/dd/Add.h"
#include "src/storm/storage/dd/Bdd.h"
#include "src/storm/adapters/AddExpressionAdapter.h"
#include "src/storage/expressions/ExpressionManager.h"
#include "src/storm/storage/expressions/ExpressionManager.h"
#include "src/models/symbolic/Dtmc.h"
#include "src/models/symbolic/Ctmc.h"
#include "src/models/symbolic/Mdp.h"
#include "src/models/symbolic/StandardRewardModel.h"
#include "src/storm/models/symbolic/Dtmc.h"
#include "src/storm/models/symbolic/Ctmc.h"
#include "src/storm/models/symbolic/Mdp.h"
#include "src/storm/models/symbolic/StandardRewardModel.h"
#include "src/settings/SettingsManager.h"
#include "src/settings/modules/CoreSettings.h"
#include "src/storm/settings/SettingsManager.h"
#include "src/storm/settings/modules/CoreSettings.h"
#include "src/utility/macros.h"
#include "src/utility/jani.h"
#include "src/utility/dd.h"
#include "src/utility/math.h"
#include "src/exceptions/WrongFormatException.h"
#include "src/exceptions/InvalidSettingsException.h"
#include "src/exceptions/InvalidArgumentException.h"
#include "src/exceptions/InvalidStateException.h"
#include "src/exceptions/NotSupportedException.h"
#include "src/storm/utility/macros.h"
#include "src/storm/utility/jani.h"
#include "src/storm/utility/dd.h"
#include "src/storm/utility/math.h"
#include "src/storm/exceptions/WrongFormatException.h"
#include "src/storm/exceptions/InvalidSettingsException.h"
#include "src/storm/exceptions/InvalidArgumentException.h"
#include "src/storm/exceptions/InvalidStateException.h"
#include "src/storm/exceptions/NotSupportedException.h"
namespace storm {
namespace builder {

6
src/storm/builder/DdJaniModelBuilder.h

@ -2,11 +2,11 @@
#include <boost/optional.hpp>
#include "src/storage/dd/DdType.h"
#include "src/storm/storage/dd/DdType.h"
#include "src/logic/Formula.h"
#include "src/storm/logic/Formula.h"
#include "src/storage/jani/Model.h"
#include "src/storm/storage/jani/Model.h"
namespace storm {
namespace models {

38
src/storm/builder/DdPrismModelBuilder.cpp

@ -1,30 +1,30 @@
#include "src/builder/DdPrismModelBuilder.h"
#include "src/storm/builder/DdPrismModelBuilder.h"
#include <boost/algorithm/string/join.hpp>
#include "src/models/symbolic/Dtmc.h"
#include "src/models/symbolic/Ctmc.h"
#include "src/models/symbolic/Mdp.h"
#include "src/models/symbolic/StandardRewardModel.h"
#include "src/storm/models/symbolic/Dtmc.h"
#include "src/storm/models/symbolic/Ctmc.h"
#include "src/storm/models/symbolic/Mdp.h"
#include "src/storm/models/symbolic/StandardRewardModel.h"
#include "src/settings/SettingsManager.h"
#include "src/storm/settings/SettingsManager.h"
#include "src/exceptions/InvalidStateException.h"
#include "src/exceptions/NotSupportedException.h"
#include "src/exceptions/InvalidArgumentException.h"
#include "src/storm/exceptions/InvalidStateException.h"
#include "src/storm/exceptions/NotSupportedException.h"
#include "src/storm/exceptions/InvalidArgumentException.h"
#include "src/utility/prism.h"
#include "src/utility/math.h"
#include "src/utility/dd.h"
#include "src/storm/utility/prism.h"
#include "src/storm/utility/math.h"
#include "src/storm/utility/dd.h"
#include "src/storage/dd/DdManager.h"
#include "src/storage/prism/Program.h"
#include "src/storage/prism/Compositions.h"
#include "src/storage/dd/Add.h"
#include "src/storage/dd/cudd/CuddAddIterator.h"
#include "src/storage/dd/Bdd.h"
#include "src/storm/storage/dd/DdManager.h"
#include "src/storm/storage/prism/Program.h"
#include "src/storm/storage/prism/Compositions.h"
#include "src/storm/storage/dd/Add.h"
#include "src/storm/storage/dd/cudd/CuddAddIterator.h"
#include "src/storm/storage/dd/Bdd.h"
#include "src/settings/modules/CoreSettings.h"
#include "src/storm/settings/modules/CoreSettings.h"
namespace storm {
namespace builder {

8
src/storm/builder/DdPrismModelBuilder.h

@ -4,11 +4,11 @@
#include <map>
#include <boost/optional.hpp>
#include "src/storage/prism/Program.h"
#include "src/storm/storage/prism/Program.h"
#include "src/logic/Formulas.h"
#include "src/adapters/AddExpressionAdapter.h"
#include "src/utility/macros.h"
#include "src/storm/logic/Formulas.h"
#include "src/storm/adapters/AddExpressionAdapter.h"
#include "src/storm/utility/macros.h"
namespace storm {
namespace dd {

10
src/storm/builder/DftExplorationHeuristic.cpp

@ -1,8 +1,8 @@
#include "src/builder/DftExplorationHeuristic.h"
#include "src/adapters/CarlAdapter.h"
#include "src/utility/macros.h"
#include "src/utility/constants.h"
#include "src/exceptions/NotImplementedException.h"
#include "src/storm/builder/DftExplorationHeuristic.h"
#include "src/storm/adapters/CarlAdapter.h"
#include "src/storm/utility/macros.h"
#include "src/storm/utility/constants.h"
#include "src/storm/exceptions/NotImplementedException.h"
namespace storm {
namespace builder {

4
src/storm/builder/DftSmtBuilder.cpp

@ -1,5 +1,5 @@
#include "src/builder/DftSmtBuilder.h"
#include "src/exceptions/NotImplementedException.h"
#include "src/storm/builder/DftSmtBuilder.h"
#include "src/storm/exceptions/NotImplementedException.h"
namespace storm {
namespace builder {

6
src/storm/builder/DftSmtBuilder.h

@ -1,9 +1,9 @@
#ifndef DFTSMTBUILDER_H
#define DFTSMTBUILDER_H
#include "src/solver/SmtSolver.h"
#include "src/utility/solver.h"
#include "src/storage/dft/DFT.h"
#include "src/storm/solver/SmtSolver.h"
#include "src/storm/utility/solver.h"
#include "src/storm/storage/dft/DFT.h"
namespace storm {
namespace builder {

16
src/storm/builder/ExplicitDFTModelBuilder.cpp

@ -1,11 +1,11 @@
#include "src/builder/ExplicitDFTModelBuilder.h"
#include <src/models/sparse/MarkovAutomaton.h>
#include <src/models/sparse/Ctmc.h>
#include <src/utility/constants.h>
#include "src/utility/vector.h"
#include <src/exceptions/UnexpectedException.h>
#include "src/settings/modules/DFTSettings.h"
#include "src/settings/SettingsManager.h"
#include "src/storm/builder/ExplicitDFTModelBuilder.h"
#include "src/storm/models/sparse/MarkovAutomaton.h"
#include "src/storm/models/sparse/Ctmc.h"
#include "src/storm/utility/constants.h"
#include "src/storm/utility/vector.h"
#include "src/storm/exceptions/UnexpectedException.h"
#include "src/storm/settings/modules/DFTSettings.h"
#include "src/storm/settings/SettingsManager.h"
#include <map>
namespace storm {

14
src/storm/builder/ExplicitDFTModelBuilder.h

@ -1,13 +1,13 @@
#ifndef EXPLICITDFTMODELBUILDER_H
#define EXPLICITDFTMODELBUILDER_H
#include <src/models/sparse/StateLabeling.h>
#include <src/models/sparse/StandardRewardModel.h>
#include <src/models/sparse/Model.h>
#include <src/storage/SparseMatrix.h>
#include <src/storage/BitVectorHashMap.h>
#include <src/storage/dft/DFT.h>
#include <src/storage/dft/SymmetricUnits.h>
#include "src/storm/models/sparse/StateLabeling.h"
#include "src/storm/models/sparse/StandardRewardModel.h"
#include "src/storm/models/sparse/Model.h"
#include "src/storm/storage/SparseMatrix.h"
#include "src/storm/storage/BitVectorHashMap.h"
#include "src/storm/storage/dft/DFT.h"
#include "src/storm/storage/dft/SymmetricUnits.h"
#include <boost/container/flat_set.hpp>
#include <boost/optional/optional.hpp>
#include <stack>

18
src/storm/builder/ExplicitDFTModelBuilderApprox.cpp

@ -1,12 +1,12 @@
#include "src/builder/ExplicitDFTModelBuilderApprox.h"
#include <src/models/sparse/MarkovAutomaton.h>
#include <src/models/sparse/Ctmc.h>
#include <src/utility/constants.h>
#include <src/utility/vector.h>
#include "src/utility/bitoperations.h"
#include <src/exceptions/UnexpectedException.h>
#include "src/settings/modules/DFTSettings.h"
#include "src/settings/SettingsManager.h"
#include "src/storm/builder/ExplicitDFTModelBuilderApprox.h"
#include "src/storm/models/sparse/MarkovAutomaton.h"
#include "src/storm/models/sparse/Ctmc.h"
#include "src/storm/utility/constants.h"
#include "src/storm/utility/vector.h"
#include "src/storm/utility/bitoperations.h"
#include "src/storm/exceptions/UnexpectedException.h"
#include "src/storm/settings/modules/DFTSettings.h"
#include "src/storm/settings/SettingsManager.h"
#include <map>
namespace storm {

20
src/storm/builder/ExplicitDFTModelBuilderApprox.h

@ -1,16 +1,16 @@
#ifndef EXPLICITDFTMODELBUILDERAPPROX_H
#define EXPLICITDFTMODELBUILDERAPPROX_H
#include "src/builder/DftExplorationHeuristic.h"
#include "src/models/sparse/StateLabeling.h"
#include "src/models/sparse/StandardRewardModel.h"
#include "src/models/sparse/Model.h"
#include "src/generator/DftNextStateGenerator.h"
#include "src/storage/SparseMatrix.h"
#include "src/storage/sparse/StateStorage.h"
#include "src/storage/dft/DFT.h"
#include "src/storage/dft/SymmetricUnits.h"
#include "src/storage/BucketPriorityQueue.h"
#include "src/storm/builder/DftExplorationHeuristic.h"
#include "src/storm/models/sparse/StateLabeling.h"
#include "src/storm/models/sparse/StandardRewardModel.h"
#include "src/storm/models/sparse/Model.h"
#include "src/storm/generator/DftNextStateGenerator.h"
#include "src/storm/storage/SparseMatrix.h"
#include "src/storm/storage/sparse/StateStorage.h"
#include "src/storm/storage/dft/DFT.h"
#include "src/storm/storage/dft/SymmetricUnits.h"
#include "src/storm/storage/BucketPriorityQueue.h"
#include <boost/container/flat_set.hpp>
#include <boost/optional/optional.hpp>
#include <stack>

14
src/storm/builder/ExplicitGspnModelBuilder.cpp

@ -1,12 +1,12 @@
//#include "src/builder/ExplicitGspnModelBuilder.h"
//#include "src/storm/builder/ExplicitGspnModelBuilder.h"
//
//#include "src/models/sparse/StandardRewardModel.h"
//#include "src/storm/models/sparse/StandardRewardModel.h"
//
//#include "src/utility/macros.h"
//#include "src/exceptions/NotImplementedException.h"
//#include "src/storage/expressions/ExpressionManager.h"
//#include "src/parser/FormulaParser.h"
//#include "src/storage/expressions/ExpressionEvaluator.h"
//#include "src/storm/utility/macros.h"
//#include "src/storm/exceptions/NotImplementedException.h"
//#include "src/storm/storage/expressions/ExpressionManager.h"
//#include "src/storm/parser/FormulaParser.h"
//#include "src/storm/storage/expressions/ExpressionEvaluator.h"
//
//namespace storm {
// namespace builder {

14
src/storm/builder/ExplicitGspnModelBuilder.h

@ -3,13 +3,13 @@
//
//#include <string>
//
//#include "src/models/sparse/MarkovAutomaton.h"
//#include "src/models/sparse/StandardRewardModel.h"
//#include "src/storage/BitVector.h"
//#include "src/storage/BitVectorHashMap.h"
//#include "src/storage/gspn/GSPN.h"
//#include "src/storage/gspn/ImmediateTransition.h"
//#include "src/storage/gspn/TimedTransition.h"
//#include "src/storm/models/sparse/MarkovAutomaton.h"
//#include "src/storm/models/sparse/StandardRewardModel.h"
//#include "src/storm/storage/BitVector.h"
//#include "src/storm/storage/BitVectorHashMap.h"
//#include "src/storm/storage/gspn/GSPN.h"
//#include "src/storm/storage/gspn/ImmediateTransition.h"
//#include "src/storm/storage/gspn/TimedTransition.h"
//
//namespace storm {
// namespace builder {

38
src/storm/builder/ExplicitModelBuilder.cpp

@ -1,31 +1,31 @@
#include "src/builder/ExplicitModelBuilder.h"
#include "src/storm/builder/ExplicitModelBuilder.h"
#include <map>
#include "src/models/sparse/Dtmc.h"
#include "src/models/sparse/Ctmc.h"
#include "src/models/sparse/Mdp.h"
#include "src/models/sparse/MarkovAutomaton.h"
#include "src/models/sparse/StandardRewardModel.h"
#include "src/storm/models/sparse/Dtmc.h"
#include "src/storm/models/sparse/Ctmc.h"
#include "src/storm/models/sparse/Mdp.h"
#include "src/storm/models/sparse/MarkovAutomaton.h"
#include "src/storm/models/sparse/StandardRewardModel.h"
#include "src/storage/expressions/ExpressionManager.h"
#include "src/storm/storage/expressions/ExpressionManager.h"
#include "src/settings/modules/CoreSettings.h"
#include "src/settings/modules/IOSettings.h"
#include "src/storm/settings/modules/CoreSettings.h"
#include "src/storm/settings/modules/IOSettings.h"
#include "src/builder/RewardModelBuilder.h"
#include "src/storm/builder/RewardModelBuilder.h"
#include "src/generator/PrismNextStateGenerator.h"
#include "src/generator/JaniNextStateGenerator.h"
#include "src/storm/generator/PrismNextStateGenerator.h"
#include "src/storm/generator/JaniNextStateGenerator.h"
#include "src/utility/prism.h"
#include "src/utility/constants.h"
#include "src/utility/macros.h"
#include "src/utility/ConstantsComparator.h"
#include "src/exceptions/WrongFormatException.h"
#include "src/storm/utility/prism.h"
#include "src/storm/utility/constants.h"
#include "src/storm/utility/macros.h"
#include "src/storm/utility/ConstantsComparator.h"
#include "src/storm/exceptions/WrongFormatException.h"
#include "src/exceptions/InvalidArgumentException.h"
#include "src/exceptions/InvalidOperationException.h"
#include "src/storm/exceptions/InvalidArgumentException.h"
#include "src/storm/exceptions/InvalidOperationException.h"
namespace storm {
namespace builder {

34
src/storm/builder/ExplicitModelBuilder.h

@ -10,27 +10,27 @@
#include <boost/container/flat_set.hpp>
#include <boost/container/flat_map.hpp>
#include <boost/variant.hpp>
#include "src/models/sparse/StandardRewardModel.h"
#include "src/storm/models/sparse/StandardRewardModel.h"
#include "src/storage/prism/Program.h"
#include "src/storage/expressions/ExpressionEvaluator.h"
#include "src/storage/BitVectorHashMap.h"
#include "src/logic/Formulas.h"
#include "src/models/sparse/StateAnnotation.h"
#include "src/models/sparse/Model.h"
#include "src/models/sparse/StateLabeling.h"
#include "src/storage/SparseMatrix.h"
#include "src/storage/sparse/StateValuations.h"
#include "src/storage/sparse/StateStorage.h"
#include "src/settings/SettingsManager.h"
#include "src/storm/storage/prism/Program.h"
#include "src/storm/storage/expressions/ExpressionEvaluator.h"
#include "src/storm/storage/BitVectorHashMap.h"
#include "src/storm/logic/Formulas.h"
#include "src/storm/models/sparse/StateAnnotation.h"
#include "src/storm/models/sparse/Model.h"
#include "src/storm/models/sparse/StateLabeling.h"
#include "src/storm/storage/SparseMatrix.h"
#include "src/storm/storage/sparse/StateValuations.h"
#include "src/storm/storage/sparse/StateStorage.h"
#include "src/storm/settings/SettingsManager.h"
#include "src/utility/prism.h"
#include "src/storm/utility/prism.h"
#include "src/builder/ExplorationOrder.h"
#include "src/storm/builder/ExplorationOrder.h"
#include "src/generator/NextStateGenerator.h"
#include "src/generator/CompressedState.h"
#include "src/generator/VariableInformation.h"
#include "src/storm/generator/NextStateGenerator.h"
#include "src/storm/generator/CompressedState.h"
#include "src/storm/generator/VariableInformation.h"
namespace storm {
namespace utility {

4
src/storm/builder/ExplorationOrder.cpp

@ -1,4 +1,4 @@
#include "src/builder/ExplorationOrder.h"
#include "src/storm/builder/ExplorationOrder.h"
namespace storm {
namespace builder {
@ -19,4 +19,4 @@ namespace storm {
}
}
}
}

2
src/storm/builder/ExplorationOrder.h

@ -14,4 +14,4 @@ namespace storm {
}
}
#endif /* STORM_BUILDER_EXPLORATIONORDER_H_ */
#endif /* STORM_BUILDER_EXPLORATIONORDER_H_ */

8
src/storm/builder/JaniGSPNBuilder.h

@ -1,8 +1,8 @@
#pragma once
#include "src/storage/gspn/GSPN.h"
#include "src/storage/jani/Model.h"
#include "src/storage/expressions/ExpressionManager.h"
#include "src/storm/storage/gspn/GSPN.h"
#include "src/storm/storage/jani/Model.h"
#include "src/storm/storage/expressions/ExpressionManager.h"
namespace storm {
namespace builder {
@ -159,4 +159,4 @@ namespace storm {
};
}
}
}

2
src/storm/builder/JaniProgramGraphBuilder.cpp

@ -1,6 +1,6 @@
#include "JaniProgramGraphBuilder.h"
#include "src/storage/jani/EdgeDestination.h"
#include "src/storm/storage/jani/EdgeDestination.h"
namespace storm {
namespace builder {

16
src/storm/builder/JaniProgramGraphBuilder.h

@ -1,14 +1,14 @@
#include <string>
#include <unordered_map>
#include "src/storage/ppg/ProgramGraph.h"
#include "src/storage/jani/Model.h"
#include "src/storage/jani/Location.h"
#include "src/storage/jani/EdgeDestination.h"
#include "src/storage/IntegerInterval.h"
#include "src/exceptions/NotSupportedException.h"
#include "src/storm/storage/ppg/ProgramGraph.h"
#include "src/storm/storage/jani/Model.h"
#include "src/storm/storage/jani/Location.h"
#include "src/storm/storage/jani/EdgeDestination.h"
#include "src/storm/storage/IntegerInterval.h"
#include "src/storm/exceptions/NotSupportedException.h"
#include "src/utility/macros.h"
#include "src/storm/utility/macros.h"
namespace storm {
namespace builder {
@ -179,4 +179,4 @@ namespace storm {
};
}
}
}

6
src/storm/builder/ParallelCompositionBuilder.cpp

@ -1,6 +1,6 @@
#include "src/builder/ParallelCompositionBuilder.h"
#include "src/models/sparse/StandardRewardModel.h"
#include <src/utility/constants.h>
#include "src/storm/builder/ParallelCompositionBuilder.h"
#include "src/storm/models/sparse/StandardRewardModel.h"
#include "src/storm/utility/constants.h"
namespace storm {
namespace builder {

2
src/storm/builder/ParallelCompositionBuilder.h

@ -1,7 +1,7 @@
#ifndef PARALLELCOMPOSITIONBUILDER_H
#define PARALLELCOMPOSITIONBUILDER_H
#include <src/models/sparse/Ctmc.h>
#include "src/storm/models/sparse/Ctmc.h"
namespace storm {
namespace builder {

14
src/storm/builder/ProgramGraphBuilder.cpp

@ -1,10 +1,10 @@
#include "ProgramGraphBuilder.h"
#include "src/storage/pgcl/AssignmentStatement.h"
#include "src/storage/pgcl/ObserveStatement.h"
#include "src/storage/pgcl/LoopStatement.h"
#include "src/storage/pgcl/IfStatement.h"
#include "src/storage/pgcl/NondeterministicBranch.h"
#include "src/storage/pgcl/ProbabilisticBranch.h"
#include "src/storm/storage/pgcl/AssignmentStatement.h"
#include "src/storm/storage/pgcl/ObserveStatement.h"
#include "src/storm/storage/pgcl/LoopStatement.h"
#include "src/storm/storage/pgcl/IfStatement.h"
#include "src/storm/storage/pgcl/NondeterministicBranch.h"
#include "src/storm/storage/pgcl/ProbabilisticBranch.h"
namespace storm {
@ -74,4 +74,4 @@ namespace storm {
builder.buildBlock(*s.getRightBranch());
}
}
}
}

10
src/storm/builder/ProgramGraphBuilder.h

@ -1,9 +1,9 @@
#pragma once
#include "src/storage/pgcl/PgclProgram.h"
#include "src/storage/ppg/ProgramGraph.h"
#include "src/storage/pgcl/AbstractStatementVisitor.h"
#include "src/storage/pgcl/UniformExpression.h"
#include "src/storm/storage/pgcl/PgclProgram.h"
#include "src/storm/storage/ppg/ProgramGraph.h"
#include "src/storm/storage/pgcl/AbstractStatementVisitor.h"
#include "src/storm/storage/pgcl/UniformExpression.h"
namespace storm {
namespace builder {
@ -152,4 +152,4 @@ namespace storm {
};
}
}
}

10
src/storm/builder/RewardModelBuilder.cpp

@ -1,11 +1,11 @@
#include "src/builder/RewardModelBuilder.h"
#include "src/storm/builder/RewardModelBuilder.h"
#include "src/adapters/CarlAdapter.h"
#include "src/storm/adapters/CarlAdapter.h"
#include "src/models/sparse/StandardRewardModel.h"
#include "src/storm/models/sparse/StandardRewardModel.h"
#include "src/utility/macros.h"
#include "src/exceptions/InvalidArgumentException.h"
#include "src/storm/utility/macros.h"
#include "src/storm/exceptions/InvalidArgumentException.h"
namespace storm {
namespace builder {

2
src/storm/builder/RewardModelBuilder.h

@ -3,7 +3,7 @@
#include <vector>
#include <cstdint>
#include "src/builder/RewardModelInformation.h"
#include "src/storm/builder/RewardModelInformation.h"
namespace storm {
namespace models {

2
src/storm/builder/RewardModelInformation.cpp

@ -1,4 +1,4 @@
#include "src/builder/RewardModelInformation.h"
#include "src/storm/builder/RewardModelInformation.h"
namespace storm {
namespace builder {

6
src/storm/builder/jit/Choice.cpp

@ -1,8 +1,8 @@
#include "src/builder/jit/Choice.h"
#include "src/storm/builder/jit/Choice.h"
#include "src/adapters/CarlAdapter.h"
#include "src/storm/adapters/CarlAdapter.h"
#include "src/utility/constants.h"
#include "src/storm/utility/constants.h"
namespace storm {
namespace builder {

2
src/storm/builder/jit/Choice.h

@ -2,7 +2,7 @@
#include <cstdint>
#include "src/builder/jit/Distribution.h"
#include "src/storm/builder/jit/Distribution.h"
namespace storm {
namespace builder {

4
src/storm/builder/jit/Distribution.cpp

@ -1,6 +1,6 @@
#include "src/builder/jit/Distribution.h"
#include "src/storm/builder/jit/Distribution.h"
#include "src/adapters/CarlAdapter.h"
#include "src/storm/adapters/CarlAdapter.h"
namespace storm {
namespace builder {

2
src/storm/builder/jit/Distribution.h

@ -2,7 +2,7 @@
#include <vector>
#include "src/builder/jit/DistributionEntry.h"
#include "src/storm/builder/jit/DistributionEntry.h"
namespace storm {
namespace builder {

4
src/storm/builder/jit/DistributionEntry.cpp

@ -1,6 +1,6 @@
#include "src/builder/jit/DistributionEntry.h"
#include "src/storm/builder/jit/DistributionEntry.h"
#include "src/adapters/CarlAdapter.h"
#include "src/storm/adapters/CarlAdapter.h"
namespace storm {
namespace builder {

58
src/storm/builder/jit/ExplicitJitJaniModelBuilder.cpp

@ -1,31 +1,31 @@
#include "src/builder/jit/ExplicitJitJaniModelBuilder.h"
#include "src/storm/builder/jit/ExplicitJitJaniModelBuilder.h"
#include <iostream>
#include <cstdio>
#include <chrono>
#include "src/solver/SmtSolver.h"
#include "src/storage/jani/AutomatonComposition.h"
#include "src/storage/jani/ParallelComposition.h"
#include "src/storage/jani/JSONExporter.h"
#include "src/storm/solver/SmtSolver.h"
#include "src/storm/storage/jani/AutomatonComposition.h"
#include "src/storm/storage/jani/ParallelComposition.h"
#include "src/storm/storage/jani/JSONExporter.h"
#include "src/builder/RewardModelInformation.h"
#include "src/storm/builder/RewardModelInformation.h"
#include "src/models/sparse/Dtmc.h"
#include "src/models/sparse/StandardRewardModel.h"
#include "src/storm/models/sparse/Dtmc.h"
#include "src/storm/models/sparse/StandardRewardModel.h"
#include "src/utility/macros.h"
#include "src/utility/solver.h"
#include "src/exceptions/WrongFormatException.h"
#include "src/exceptions/InvalidStateException.h"
#include "src/exceptions/InvalidArgumentException.h"
#include "src/exceptions/NotSupportedException.h"
#include "src/exceptions/UnexpectedException.h"
#include "src/storm/utility/macros.h"
#include "src/storm/utility/solver.h"
#include "src/storm/exceptions/WrongFormatException.h"
#include "src/storm/exceptions/InvalidStateException.h"
#include "src/storm/exceptions/InvalidArgumentException.h"
#include "src/storm/exceptions/NotSupportedException.h"
#include "src/storm/exceptions/UnexpectedException.h"
#include "src/settings/SettingsManager.h"
#include "src/settings/modules/JitBuilderSettings.h"
#include "src/storm/settings/SettingsManager.h"
#include "src/storm/settings/modules/JitBuilderSettings.h"
#include "src/utility/OsDetection.h"
#include "src/storm/utility/OsDetection.h"
#include "storm-config.h"
namespace storm {
@ -329,7 +329,7 @@ namespace storm {
std::string problem = "Unable to compile program using Storm data structures. Is Storm's root directory '" + stormRoot + "' set correctly? Does the directory contain the source subtree under src/ ?";
try {
std::string program = R"(
#include "src/builder/RewardModelInformation.h"
#include "src/storm/builder/RewardModelInformation.h"
int main() {
return 0;
@ -395,7 +395,7 @@ namespace storm {
std::string problem = "Unable to compile program using Carl data structures. Is Carls's include directory '" + carlIncludeDirectory + "' set correctly?";
try {
std::string program = R"(
#include "src/adapters/NumberAdapter.h"
#include "src/storm/adapters/NumberAdapter.h"
int main() {
return 0;
@ -1639,23 +1639,23 @@ namespace storm {
#include <boost/dll/alias.hpp>
{% if exact %}
#include "src/adapters/NumberAdapter.h"
#include "src/storm/adapters/NumberAdapter.h"
{% endif %}
{% if parametric %}
#include "src/adapters/CarlAdapter.h"
#include "src/storm/adapters/CarlAdapter.h"
{% endif %}
#include "resources/3rdparty/sparsepp/sparsepp.h"
#include "src/builder/jit/StateSet.h"
#include "src/builder/jit/JitModelBuilderInterface.h"
#include "src/builder/jit/StateBehaviour.h"
#include "src/builder/jit/ModelComponentsBuilder.h"
#include "src/builder/RewardModelInformation.h"
#include "src/storm/builder/jit/StateSet.h"
#include "src/storm/builder/jit/JitModelBuilderInterface.h"
#include "src/storm/builder/jit/StateBehaviour.h"
#include "src/storm/builder/jit/ModelComponentsBuilder.h"
#include "src/storm/builder/RewardModelInformation.h"
#include "src/utility/constants.h"
#include "src/storm/utility/constants.h"
#include "src/exceptions/WrongFormatException.h"
#include "src/storm/exceptions/WrongFormatException.h"
namespace storm {
namespace builder {

14
src/storm/builder/jit/ExplicitJitJaniModelBuilder.h

@ -8,15 +8,15 @@
#include "cpptempl.h"
#include "src/adapters/CarlAdapter.h"
#include "src/storm/adapters/CarlAdapter.h"
#include "src/storage/jani/Model.h"
#include "src/storage/jani/ParallelComposition.h"
#include "src/storage/expressions/ToCppVisitor.h"
#include "src/storm/storage/jani/Model.h"
#include "src/storm/storage/jani/ParallelComposition.h"
#include "src/storm/storage/expressions/ToCppVisitor.h"
#include "src/builder/BuilderOptions.h"
#include "src/builder/jit/JitModelBuilderInterface.h"
#include "src/builder/jit/ModelComponentsBuilder.h"
#include "src/storm/builder/BuilderOptions.h"
#include "src/storm/builder/jit/JitModelBuilderInterface.h"
#include "src/storm/builder/jit/ModelComponentsBuilder.h"
namespace storm {
namespace models {

4
src/storm/builder/jit/JitModelBuilderInterface.cpp

@ -1,6 +1,6 @@
#include "src/builder/jit/JitModelBuilderInterface.h"
#include "src/storm/builder/jit/JitModelBuilderInterface.h"
#include "src/adapters/CarlAdapter.h"
#include "src/storm/adapters/CarlAdapter.h"
namespace storm {
namespace builder {

2
src/storm/builder/jit/JitModelBuilderInterface.h

@ -2,7 +2,7 @@
#include <memory>
#include "src/builder/jit/ModelComponentsBuilder.h"
#include "src/storm/builder/jit/ModelComponentsBuilder.h"
namespace storm {
namespace models {

26
src/storm/builder/jit/ModelComponentsBuilder.cpp

@ -1,20 +1,20 @@
#include "src/builder/jit/ModelComponentsBuilder.h"
#include "src/storm/builder/jit/ModelComponentsBuilder.h"
#include "src/models/sparse/StateLabeling.h"
#include "src/models/sparse/Dtmc.h"
#include "src/models/sparse/Ctmc.h"
#include "src/models/sparse/Mdp.h"
#include "src/models/sparse/MarkovAutomaton.h"
#include "src/models/sparse/StandardRewardModel.h"
#include "src/storm/models/sparse/StateLabeling.h"
#include "src/storm/models/sparse/Dtmc.h"
#include "src/storm/models/sparse/Ctmc.h"
#include "src/storm/models/sparse/Mdp.h"
#include "src/storm/models/sparse/MarkovAutomaton.h"
#include "src/storm/models/sparse/StandardRewardModel.h"
#include "src/builder/RewardModelBuilder.h"
#include "src/storm/builder/RewardModelBuilder.h"
#include "src/settings/SettingsManager.h"
#include "src/settings/modules/CoreSettings.h"
#include "src/storm/settings/SettingsManager.h"
#include "src/storm/settings/modules/CoreSettings.h"
#include "src/exceptions/WrongFormatException.h"
#include "src/utility/macros.h"
#include "src/utility/constants.h"
#include "src/storm/exceptions/WrongFormatException.h"
#include "src/storm/utility/macros.h"
#include "src/storm/utility/constants.h"
namespace storm {
namespace builder {

4
src/storm/builder/jit/ModelComponentsBuilder.h

@ -2,9 +2,9 @@
#include <memory>
#include "src/builder/jit/StateBehaviour.h"
#include "src/storm/builder/jit/StateBehaviour.h"
#include "src/storage/jani/ModelType.h"
#include "src/storm/storage/jani/ModelType.h"
namespace storm {
namespace storage {

6
src/storm/builder/jit/StateBehaviour.cpp

@ -1,8 +1,8 @@
#include "src/builder/jit/StateBehaviour.h"
#include "src/storm/builder/jit/StateBehaviour.h"
#include "src/adapters/CarlAdapter.h"
#include "src/storm/adapters/CarlAdapter.h"
#include "src/utility/constants.h"
#include "src/storm/utility/constants.h"
namespace storm {
namespace builder {

4
src/storm/builder/jit/StateBehaviour.h

@ -1,7 +1,7 @@
#pragma once
#include "src/storage/jani/ModelType.h"
#include "src/builder/jit/Choice.h"
#include "src/storm/storage/jani/ModelType.h"
#include "src/storm/builder/jit/Choice.h"
namespace storm {
namespace builder {

16
src/storm/cli/cli.cpp

@ -3,16 +3,16 @@
#include "../utility/storm.h"
#include "src/storage/SymbolicModelDescription.h"
#include "src/storm/storage/SymbolicModelDescription.h"
#include "src/settings/modules/DebugSettings.h"
#include "src/settings/modules/IOSettings.h"
#include "src/settings/modules/CoreSettings.h"
#include "src/exceptions/OptionParserException.h"
#include "src/settings/modules/JaniExportSettings.h"
#include "src/storm/settings/modules/DebugSettings.h"
#include "src/storm/settings/modules/IOSettings.h"
#include "src/storm/settings/modules/CoreSettings.h"
#include "src/storm/exceptions/OptionParserException.h"
#include "src/storm/settings/modules/JaniExportSettings.h"
#include "src/utility/storm-version.h"
#include "src/storage/jani/JSONExporter.h"
#include "src/storm/utility/storm-version.h"
#include "src/storm/storage/jani/JSONExporter.h"
// Includes for the linked libraries and versions header.

12
src/storm/cli/entrypoints.h

@ -1,14 +1,14 @@
#ifndef STORM_ENTRYPOINTS_H_H
#define STORM_ENTRYPOINTS_H_H
#include "src/utility/storm.h"
#include "src/storm/utility/storm.h"
#include "src/storage/SymbolicModelDescription.h"
#include "src/utility/ExplicitExporter.h"
#include "src/storm/storage/SymbolicModelDescription.h"
#include "src/storm/utility/ExplicitExporter.h"
#include "src/exceptions/NotImplementedException.h"
#include "src/exceptions/InvalidSettingsException.h"
#include "src/exceptions/UnexpectedException.h"
#include "src/storm/exceptions/NotImplementedException.h"
#include "src/storm/exceptions/InvalidSettingsException.h"
#include "src/storm/exceptions/UnexpectedException.h"
namespace storm {
namespace cli {

34
src/storm/counterexamples/MILPMinimalLabelSetGenerator.h

@ -3,25 +3,25 @@
#include <chrono>
#include "src/models/sparse/Mdp.h"
#include "src/logic/Formulas.h"
#include "src/storage/prism/Program.h"
#include "src/modelchecker/prctl/helper/SparseMdpPrctlHelper.h"
#include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
#include "src/exceptions/NotImplementedException.h"
#include "src/exceptions/InvalidPropertyException.h"
#include "src/exceptions/InvalidArgumentException.h"
#include "src/exceptions/InvalidStateException.h"
#include "src/storm/models/sparse/Mdp.h"
#include "src/storm/logic/Formulas.h"
#include "src/storm/storage/prism/Program.h"
#include "src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.h"
#include "src/storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
#include "src/storm/exceptions/NotImplementedException.h"
#include "src/storm/exceptions/InvalidPropertyException.h"
#include "src/storm/exceptions/InvalidArgumentException.h"
#include "src/storm/exceptions/InvalidStateException.h"
#include "src/utility/graph.h"
#include "src/utility/counterexamples.h"
#include "src/utility/solver.h"
#include "src/solver/LpSolver.h"
#include "src/storm/utility/graph.h"
#include "src/storm/utility/counterexamples.h"
#include "src/storm/utility/solver.h"
#include "src/storm/solver/LpSolver.h"
#include "src/settings/SettingsManager.h"
#include "src/settings/modules/GeneralSettings.h"
#include "src/settings/modules/CounterexampleGeneratorSettings.h"
#include "src/storm/settings/SettingsManager.h"
#include "src/storm/settings/modules/GeneralSettings.h"
#include "src/storm/settings/modules/CounterexampleGeneratorSettings.h"
namespace storm {
namespace counterexamples {

18
src/storm/counterexamples/SMTMinimalCommandSetGenerator.h

@ -4,17 +4,17 @@
#include <queue>
#include <chrono>
#include "src/solver/Z3SmtSolver.h"
#include "src/storm/solver/Z3SmtSolver.h"
#include "src/storage/prism/Program.h"
#include "src/storage/expressions/Expression.h"
#include "src/modelchecker/prctl/helper/SparseMdpPrctlHelper.h"
#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
#include "src/settings/SettingsManager.h"
#include "src/settings/modules/CoreSettings.h"
#include "src/storm/storage/prism/Program.h"
#include "src/storm/storage/expressions/Expression.h"
#include "src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.h"
#include "src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
#include "src/storm/settings/SettingsManager.h"
#include "src/storm/settings/modules/CoreSettings.h"
#include "src/utility/counterexamples.h"
#include "src/utility/prism.h"
#include "src/storm/utility/counterexamples.h"
#include "src/storm/utility/prism.h"
namespace storm {
namespace counterexamples {

4
src/storm/exceptions/ArgumentUnificationException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_ARGUMENTUNIFICATIONEXCEPTION_H_
#define STORM_EXCEPTIONS_ARGUMENTUNIFICATIONEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/BaseException.cpp

@ -1,4 +1,4 @@
#include "src/exceptions/BaseException.h"
#include "src/storm/exceptions/BaseException.h"
namespace storm {
namespace exceptions {
@ -26,4 +26,4 @@ namespace storm {
return result;
}
}
}
}

2
src/storm/exceptions/BaseException.h

@ -4,7 +4,7 @@
#include <exception>
#include <sstream>
#include "src/utility/OsDetection.h"
#include "src/storm/utility/OsDetection.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/ExpressionEvaluationException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_EXPRESSIONEVALUATIONEXCEPTION_H_
#define STORM_EXCEPTIONS_EXPRESSIONEVALUATIONEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/FileIoException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_FILEIOEXCEPTION_H_
#define STORM_EXCEPTIONS_FILEIOEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/IllegalArgumentException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_ILLEGALARGUMENTEXCEPTION_H_
#define STORM_EXCEPTIONS_ILLEGALARGUMENTEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/IllegalArgumentTypeException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_ILLEGALARGUMENTTYPEEXCEPTION_H_
#define STORM_EXCEPTIONS_ILLEGALARGUMENTTYPEEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/IllegalArgumentValueException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_ILLEGALARGUMENTVALUEEXCEPTION_H_
#define STORM_EXCEPTIONS_ILLEGALARGUMENTVALUEEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/IllegalFunctionCallException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_ILLEGALFUNCTIONCALLEXCEPTION_H_
#define STORM_EXCEPTIONS_ILLEGALFUNCTIONCALLEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/InternalTypeErrorException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_INTERNALTYPEERROREXCEPTION_H_
#define STORM_EXCEPTIONS_INTERNALTYPEERROREXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/InvalidAccessException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_INVALIDACCESSEXCEPTION_H_
#define STORM_EXCEPTIONS_INVALIDACCESSEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/InvalidArgumentException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_INVALIDARGUMENTEXCEPTION_H_
#define STORM_EXCEPTIONS_INVALIDARGUMENTEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/InvalidJaniException.h

@ -1,8 +1,8 @@
#ifndef STORM_INVALIDJANIEXCEPTION_H
#define STORM_INVALIDJANIEXCEPTION_H
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/InvalidOperationException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_INVALIDOPERATIONEXCEPTION_H_
#define STORM_EXCEPTIONS_INVALIDOPERATIONEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/InvalidOptionException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_INVALIDOPTIONEXCEPTION_H_
#define STORM_EXCEPTIONS_INVALIDOPTIONEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/InvalidPropertyException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_INVALIDPROPERTYEXCEPTION_H_
#define STORM_EXCEPTIONS_INVALIDPROPERTYEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/InvalidSettingsException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_INVALIDSETTINGSEXCEPTION_H_
#define STORM_EXCEPTIONS_INVALIDSETTINGSEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/InvalidStateException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_INVALIDSTATEEXCEPTION_H_
#define STORM_EXCEPTIONS_INVALIDSTATEEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/InvalidTypeException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_INVALIDTYPEEXCEPTION_H_
#define STORM_EXCEPTIONS_INVALIDTYPEEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/NoConvergenceException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_NOCONVERGENCEEXCEPTION_H_
#define STORM_EXCEPTIONS_NOCONVERGENCEEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/NotImplementedException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_NOTIMPLEMENTEDEXCEPTION_H_
#define STORM_EXCEPTIONS_NOTIMPLEMENTEDEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/NotSupportedException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_NOTSUPPORTEDEXCEPTION_H_
#define STORM_EXCEPTIONS_NOTSUPPORTEDEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/OptionParserException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_OPTIONPARSEREXCEPTION_H_
#define STORM_EXCEPTIONS_OPTIONPARSEREXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/OptionUnificationException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_OPTIONUNIFICATIONEXCEPTION_H_
#define STORM_EXCEPTIONS_OPTIONUNIFICATIONEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/OutOfRangeException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_OUTOFRANGEEXCEPTION_H_
#define STORM_EXCEPTIONS_OUTOFRANGEEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/UnexpectedException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_UNEXPECTEDEXCEPTION_H_
#define STORM_EXCEPTIONS_UNEXPECTEDEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/UnsupportedModelException.h

@ -1,8 +1,8 @@
#ifndef STORM_UNSUPPORTEDMODELEXCEPTION_H
#define STORM_UNSUPPORTEDMODELEXCEPTION_H
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

4
src/storm/exceptions/WrongFormatException.h

@ -1,8 +1,8 @@
#ifndef STORM_EXCEPTIONS_WRONGFORMATEXCEPTION_H_
#define STORM_EXCEPTIONS_WRONGFORMATEXCEPTION_H_
#include "src/exceptions/BaseException.h"
#include "src/exceptions/ExceptionMacros.h"
#include "src/storm/exceptions/BaseException.h"
#include "src/storm/exceptions/ExceptionMacros.h"
namespace storm {
namespace exceptions {

10
src/storm/generator/Choice.cpp

@ -1,11 +1,11 @@
#include "src/generator/Choice.h"
#include "src/storm/generator/Choice.h"
#include "src/adapters/CarlAdapter.h"
#include "src/storm/adapters/CarlAdapter.h"
#include "src/utility/constants.h"
#include "src/storm/utility/constants.h"
#include "src/utility/macros.h"
#include "src/exceptions/InvalidOperationException.h"
#include "src/storm/utility/macros.h"
#include "src/storm/exceptions/InvalidOperationException.h"
namespace storm {
namespace generator {

2
src/storm/generator/Choice.h

@ -7,7 +7,7 @@
#include <boost/optional.hpp>
#include <boost/container/flat_set.hpp>
#include "src/storage/Distribution.h"
#include "src/storm/storage/Distribution.h"
namespace storm {
namespace generator {

10
src/storm/generator/CompressedState.cpp

@ -1,9 +1,9 @@
#include "src/generator/CompressedState.h"
#include "src/storm/generator/CompressedState.h"
#include "src/generator/VariableInformation.h"
#include "src/storage/expressions/ExpressionManager.h"
#include "src/storage/expressions/SimpleValuation.h"
#include "src/storage/expressions/ExpressionEvaluator.h"
#include "src/storm/generator/VariableInformation.h"
#include "src/storm/storage/expressions/ExpressionManager.h"
#include "src/storm/storage/expressions/SimpleValuation.h"
#include "src/storm/storage/expressions/ExpressionEvaluator.h"
namespace storm {
namespace generator {

2
src/storm/generator/CompressedState.h

@ -1,7 +1,7 @@
#ifndef STORM_GENERATOR_COMPRESSEDSTATE_H_
#define STORM_GENERATOR_COMPRESSEDSTATE_H_
#include "src/storage/BitVector.h"
#include "src/storm/storage/BitVector.h"
namespace storm {
namespace expressions {

8
src/storm/generator/DftNextStateGenerator.cpp

@ -1,8 +1,8 @@
#include "src/generator/DftNextStateGenerator.h"
#include "src/storm/generator/DftNextStateGenerator.h"
#include "src/utility/constants.h"
#include "src/utility/macros.h"
#include "src/exceptions/NotImplementedException.h"
#include "src/storm/utility/constants.h"
#include "src/storm/utility/macros.h"
#include "src/storm/exceptions/NotImplementedException.h"
namespace storm {
namespace generator {

6
src/storm/generator/DftNextStateGenerator.h

@ -1,10 +1,10 @@
#ifndef STORM_GENERATOR_DFTNEXTSTATEGENERATOR_H_
#define STORM_GENERATOR_DFTNEXTSTATEGENERATOR_H_
#include "src/generator/NextStateGenerator.h"
#include "src/storage/dft/DFT.h"
#include "src/storm/generator/NextStateGenerator.h"
#include "src/storm/storage/dft/DFT.h"
#include "src/utility/ConstantsComparator.h"
#include "src/storm/utility/ConstantsComparator.h"
namespace storm {
namespace generator {

20
src/storm/generator/JaniNextStateGenerator.cpp

@ -1,17 +1,17 @@
#include "src/generator/JaniNextStateGenerator.h"
#include "src/storm/generator/JaniNextStateGenerator.h"
#include "src/models/sparse/StateLabeling.h"
#include "src/storm/models/sparse/StateLabeling.h"
#include "src/storage/expressions/SimpleValuation.h"
#include "src/storm/storage/expressions/SimpleValuation.h"
#include "src/solver/SmtSolver.h"
#include "src/storm/solver/SmtSolver.h"
#include "src/utility/constants.h"
#include "src/utility/macros.h"
#include "src/utility/solver.h"
#include "src/exceptions/InvalidSettingsException.h"
#include "src/exceptions/WrongFormatException.h"
#include "src/exceptions/InvalidArgumentException.h"
#include "src/storm/utility/constants.h"
#include "src/storm/utility/macros.h"
#include "src/storm/utility/solver.h"
#include "src/storm/exceptions/InvalidSettingsException.h"
#include "src/storm/exceptions/WrongFormatException.h"
#include "src/storm/exceptions/InvalidArgumentException.h"
namespace storm {
namespace generator {

4
src/storm/generator/JaniNextStateGenerator.h

@ -1,8 +1,8 @@
#pragma once
#include "src/generator/NextStateGenerator.h"
#include "src/storm/generator/NextStateGenerator.h"
#include "src/storage/jani/Model.h"
#include "src/storm/storage/jani/Model.h"
namespace storm {
namespace generator {

16
src/storm/generator/NextStateGenerator.cpp

@ -1,16 +1,16 @@
#include "src/generator/NextStateGenerator.h"
#include "src/storm/generator/NextStateGenerator.h"
#include "src/adapters/CarlAdapter.h"
#include "src/storm/adapters/CarlAdapter.h"
#include "src/logic/Formulas.h"
#include "src/storm/logic/Formulas.h"
#include "src/storage/expressions/ExpressionManager.h"
#include "src/storage/expressions/SimpleValuation.h"
#include "src/storm/storage/expressions/ExpressionManager.h"
#include "src/storm/storage/expressions/SimpleValuation.h"
#include "src/models/sparse/StateLabeling.h"
#include "src/storm/models/sparse/StateLabeling.h"
#include "src/utility/macros.h"
#include "src/exceptions/InvalidSettingsException.h"
#include "src/storm/utility/macros.h"
#include "src/storm/exceptions/InvalidSettingsException.h"
namespace storm {
namespace generator {

Some files were not shown because too many files changed in this diff

|||||||
100:0
Loading…
Cancel
Save