Renamed files in settings module a bit. Started on the pseudo-modular module-settings.

Former-commit-id: b3162aa86b

CMakeLists.txt

@@ -281,7 +281,7 @@ source_group(models FILES ${STORM_MODELS_FILES})
 source_group(parser FILES ${STORM_PARSER_FILES})
 source_group(parser\\prismparser FILES ${STORM_PARSER_PRISMPARSER_FILES})
 source_group(settings FILES ${STORM_SETTINGS_FILES})
-source_group(settings\\modules ${STORM_SETTINGS_MODULES_FILES})
+source_group(settings\\modules FILES ${STORM_SETTINGS_MODULES_FILES})
 source_group(solver FILES ${STORM_SOLVER_FILES})
 source_group(storage FILES ${STORM_STORAGE_FILES})
 source_group(storage\\dd FILES ${STORM_STORAGE_DD_FILES})

src/adapters/ExplicitModelAdapter.h

@@ -27,7 +27,7 @@
 #include "src/models/Ctmdp.h"
 #include "src/models/AtomicPropositionsLabeling.h"
 #include "src/storage/SparseMatrix.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/exceptions/ExceptionMacros.h"
 #include "src/exceptions/WrongFormatException.h"
 

src/modelchecker/prctl/AbstractModelChecker.h

@@ -22,7 +22,7 @@ namespace prctl {
 #include "src/properties/Prctl.h"
 #include "src/storage/BitVector.h"
 #include "src/models/AbstractModel.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 #include "log4cplus/logger.h"
 #include "log4cplus/loggingmacros.h"

src/modelchecker/prctl/SparseMdpPrctlModelChecker.h

@@ -18,7 +18,7 @@
 #include "src/utility/vector.h"
 #include "src/utility/graph.h"
 #include "src/utility/solver.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/storage/TotalScheduler.h"
 
 namespace storm {

src/models/Ctmdp.h

@@ -14,7 +14,7 @@
 #include "AtomicPropositionsLabeling.h"
 #include "AbstractNondeterministicModel.h"
 #include "src/storage/SparseMatrix.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 namespace storm {
 

src/models/Dtmc.h

@@ -17,7 +17,7 @@
 #include "AtomicPropositionsLabeling.h"
 #include "src/storage/SparseMatrix.h"
 #include "src/exceptions/InvalidArgumentException.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/utility/vector.h"
 #include "src/utility/matrix.h"
 

src/models/MarkovAutomaton.h

@@ -12,7 +12,7 @@
 #include "AtomicPropositionsLabeling.h"
 #include "src/storage/SparseMatrix.h"
 #include "src/exceptions/InvalidArgumentException.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/utility/vector.h"
 #include "src/utility/matrix.h"
 

src/models/Mdp.h

@@ -16,7 +16,7 @@
 
 #include "AtomicPropositionsLabeling.h"
 #include "src/storage/SparseMatrix.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/models/AbstractNondeterministicModel.h"
 #include "src/utility/matrix.h"
 

src/parser/DeterministicSparseTransitionParser.cpp

@@ -19,7 +19,7 @@
 #include "src/parser/MappedFile.h"
 #include "src/exceptions/FileIoException.h"
 #include "src/exceptions/WrongFormatException.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 #include "log4cplus/logger.h"
 #include "log4cplus/loggingmacros.h"

src/parser/MarkovAutomatonSparseTransitionParser.cpp

@@ -1,6 +1,6 @@
 #include "MarkovAutomatonSparseTransitionParser.h"
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/exceptions/WrongFormatException.h"
 #include "src/exceptions/FileIoException.h"
 #include "src/parser/MappedFile.h"

src/parser/NondeterministicSparseTransitionParser.cpp

@@ -10,7 +10,7 @@
 #include <string>
 
 #include "src/parser/MappedFile.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/exceptions/FileIoException.h"
 #include "src/exceptions/OutOfRangeException.h"
 #include "src/exceptions/WrongFormatException.h"

src/settings/InternalOptionMemento.h

@@ -1,7 +1,7 @@
 #ifndef STORM_SETTINGS_INTERNALOPTIONMEMENTO_H_
 #define STORM_SETTINGS_INTERNALOPTIONMEMENTO_H_
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "log4cplus/logger.h"
 #include "log4cplus/loggingmacros.h"
 

src/settings/Settings.cpp → src/settings/SettingsManager.cpp

@@ -1,4 +1,4 @@
-#include "Settings.h"
+#include "src/settings/SettingsManager.h"
 
 #include <cstring>
 #include <cctype>

src/settings/modules/GeneralSettings.cpp

@@ -0,0 +1,13 @@
+#include "src/settings/modules/GeneralSettings.h"
+
+namespace storm {
+    namespace settings {
+        namespace modules {
+            
+            GeneralSettings::GeneralSettings(storm::settings::SettingsManager& settingsManager) : ModuleSettings(settingsManager) {
+                
+            }
+            
+        } // namespace modules
+    } // namespace settings
+} // namespace storm

src/settings/modules/GeneralSettings.h

@@ -0,0 +1,16 @@
+#include "src/settings/modules/ModuleSettings.h"
+
+namespace storm {
+    namespace settings {
+        namespace modules {
+            
+            /*!
+             * This class represents the general options.
+             */
+            class GeneralSettings : public ModuleSettings {
+                GeneralSettings(storm::settings::SettingsManager& settingsManager);
+            };
+            
+        } // namespace modules
+    } // namespace settings
+} // namespace storm

src/settings/modules/ModuleSettings.cpp

@@ -0,0 +1,13 @@
+#include "src/settings/modules/ModuleSettings.h"
+
+namespace storm {
+    namespace settings {
+        namespace modules {
+            
+            ModuleSettings::ModuleSettings(storm::settings::SettingsManager& settingsManager) {
+                // Intentionally left empty.
+            }
+            
+        } // namespace modules
+    } // namespace settings
+} // namespace storm

src/settings/modules/ModuleSettings.h

@@ -0,0 +1,22 @@
+#include "src/settings/SettingsManager.h"
+
+namespace storm {
+    namespace settings {
+        namespace modules {
+            
+            /*!
+             * This is the base class of the settings for a particular module.
+             */
+            class ModuleSettings {
+            public:
+                /*!
+                 * Constructs a new settings object.
+                 *
+                 * @param settingsManager The manager responsible for these settings.
+                 */
+                ModuleSettings(storm::settings::SettingsManager& settingsManager);
+            };
+            
+        } // namespace modules
+    } // namespace settings
+} // namespace storm

src/solver/GlpkLpSolver.cpp

@@ -6,7 +6,7 @@
 
 #include "src/storage/expressions/LinearCoefficientVisitor.h"
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/exceptions/ExceptionMacros.h"
 #include "src/exceptions/InvalidAccessException.h"
 #include "src/exceptions/InvalidStateException.h"

src/solver/GmmxxLinearEquationSolver.cpp

@@ -4,7 +4,7 @@
 #include <utility>
 
 #include "src/adapters/GmmxxAdapter.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/utility/vector.h"
 #include "src/utility/constants.h"
 #include "src/exceptions/InvalidStateException.h"

src/solver/GmmxxNondeterministicLinearEquationSolver.cpp

@@ -2,7 +2,7 @@
 
 #include <utility>
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/adapters/GmmxxAdapter.h"
 #include "src/utility/vector.h"
 

src/solver/GurobiLpSolver.cpp

@@ -5,7 +5,7 @@
 
 #include "src/storage/expressions/LinearCoefficientVisitor.h"
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/exceptions/ExceptionMacros.h"
 #include "src/exceptions/InvalidStateException.h"
 #include "src/exceptions/InvalidAccessException.h"

src/solver/NativeLinearEquationSolver.cpp

@@ -2,7 +2,7 @@
 
 #include <utility>
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/utility/vector.h"
 #include "src/exceptions/InvalidStateException.h"
 

src/solver/NativeNondeterministicLinearEquationSolver.cpp

@@ -2,7 +2,7 @@
 
 #include <utility>
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/utility/vector.h"
 
 namespace storm {

src/storage/dd/CuddDdManager.cpp

@@ -5,7 +5,7 @@
 #include "src/storage/dd/CuddDdManager.h"
 #include "src/exceptions/ExceptionMacros.h"
 #include "src/exceptions/InvalidArgumentException.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 namespace storm {
     namespace dd {

src/utility/InitializeLogging.h

@@ -6,7 +6,7 @@
 #include "log4cplus/consoleappender.h"
 #include "log4cplus/fileappender.h"
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 log4cplus::Logger logger;
 

src/utility/solver.cpp

@@ -1,6 +1,6 @@
 #include "src/utility/solver.h"
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 #include "src/solver/NativeLinearEquationSolver.h"
 #include "src/solver/GmmxxLinearEquationSolver.h"

test/functional/adapter/Z3ExpressionAdapterTest.cpp

@@ -4,7 +4,7 @@
 #ifdef STORM_HAVE_Z3
 #include "z3++.h"
 #include "src/adapters/Z3ExpressionAdapter.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 TEST(Z3ExpressionAdapter, StormToZ3Basic) {
 	z3::context ctx;

test/functional/modelchecker/EigenDtmcPrctlModelCheckerTest.cpp

@@ -2,7 +2,7 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/modelchecker/EigenDtmcPrctlModelChecker.h"
 #include "src/parser/AutoParser.h"
 

test/functional/modelchecker/GmmxxDtmcPrctlModelCheckerTest.cpp

@@ -3,7 +3,7 @@
 
 #include "src/solver/GmmxxLinearEquationSolver.h"
 #include "src/modelchecker/prctl/SparseDtmcPrctlModelChecker.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/settings/InternalOptionMemento.h"
 #include "src/parser/AutoParser.h"
 

test/functional/modelchecker/SparseMdpPrctlModelCheckerTest.cpp

@@ -2,7 +2,7 @@
 #include "storm-config.h"
 
 #include "src/solver/NativeNondeterministicLinearEquationSolver.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/modelchecker/prctl/SparseMdpPrctlModelChecker.h"
 #include "src/parser/AutoParser.h"
 

test/functional/parser/MarkovAutomatonSparseTransitionParserTest.cpp

@@ -7,7 +7,7 @@
 
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 #include <vector>
 

test/functional/solver/GlpkLpSolverTest.cpp

@@ -5,7 +5,7 @@
 #include "src/solver/GlpkLpSolver.h"
 #include "src/exceptions/InvalidStateException.h"
 #include "src/exceptions/InvalidAccessException.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 TEST(GlpkLpSolver, LPOptimizeMax) {
     storm::solver::GlpkLpSolver solver(storm::solver::LpSolver::ModelSense::Maximize);

test/functional/solver/GmmxxLinearEquationSolverTest.cpp

@@ -2,7 +2,7 @@
 #include "storm-config.h"
 
 #include "src/solver/GmmxxLinearEquationSolver.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 TEST(GmmxxLinearEquationSolver, SolveWithStandardOptions) {
     ASSERT_NO_THROW(storm::storage::SparseMatrixBuilder<double> builder);

test/functional/solver/GmmxxNondeterministicLinearEquationSolverTest.cpp

@@ -2,7 +2,7 @@
 #include "storm-config.h"
 
 #include "src/solver/GmmxxNondeterministicLinearEquationSolver.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 TEST(GmmxxNondeterministicLinearEquationSolver, SolveWithStandardOptions) {
     storm::storage::SparseMatrixBuilder<double> builder(0, 0, 0, false, true);

test/functional/solver/GurobiLpSolverTest.cpp

@@ -5,7 +5,7 @@
 #include "src/solver/GurobiLpSolver.h"
 #include "src/exceptions/InvalidStateException.h"
 #include "src/exceptions/InvalidAccessException.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 TEST(GurobiLpSolver, LPOptimizeMax) {
     storm::solver::GurobiLpSolver solver(storm::solver::LpSolver::ModelSense::Maximize);

test/functional/solver/NativeLinearEquationSolverTest.cpp

@@ -2,7 +2,7 @@
 #include "storm-config.h"
 
 #include "src/solver/NativeLinearEquationSolver.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 TEST(NativeLinearEquationSolver, SolveWithStandardOptions) {
     ASSERT_NO_THROW(storm::storage::SparseMatrixBuilder<double> builder);

test/functional/solver/NativeNondeterministicLinearEquationSolverTest.cpp

@@ -2,7 +2,7 @@
 #include "storm-config.h"
 
 #include "src/solver/NativeNondeterministicLinearEquationSolver.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 TEST(NativeNondeterministicLinearEquationSolver, SolveWithStandardOptions) {
     storm::storage::SparseMatrixBuilder<double> builder(0, 0, 0, false, true);

test/functional/solver/Z3SmtSolverTest.cpp

@@ -3,7 +3,7 @@
 
 #ifdef STORM_HAVE_Z3
 #include "src/solver/Z3SmtSolver.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 TEST(Z3SmtSolver, CheckSat) {
 	storm::solver::Z3SmtSolver s;

test/functional/storm-functional-tests.cpp

@@ -6,7 +6,7 @@
 #include "log4cplus/consoleappender.h"
 #include "log4cplus/fileappender.h"
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 log4cplus::Logger logger;
 

test/performance/graph/GraphTest.cpp

@@ -1,6 +1,6 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/parser/AutoParser.h"
 #include "src/utility/graph.h"
 #include "src/storage/StronglyConnectedComponentDecomposition.h"

test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp

@@ -1,6 +1,6 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/settings/InternalOptionMemento.h"
 #include "src/modelchecker/prctl/SparseDtmcPrctlModelChecker.h"
 #include "src/solver/GmmxxLinearEquationSolver.h"

test/performance/modelchecker/SparseMdpPrctlModelCheckerTest.cpp

@@ -1,7 +1,7 @@
 #include "gtest/gtest.h"
 #include "storm-config.h"
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 #include "src/modelchecker/prctl/SparseMdpPrctlModelChecker.h"
 #include "src/solver/NativeNondeterministicLinearEquationSolver.h"
 #include "src/parser/AutoParser.h"

test/performance/storm-performance-tests.cpp

@@ -6,7 +6,7 @@
 #include "log4cplus/consoleappender.h"
 #include "log4cplus/fileappender.h"
 
-#include "src/settings/Settings.h"
+#include "src/settings/SettingsManager.h"
 
 log4cplus::Logger logger;