From b826ac92acbfd513fb8825fe8563e58e866f12a0 Mon Sep 17 00:00:00 2001 From: sjunges Date: Thu, 4 Aug 2016 23:06:19 +0200 Subject: [PATCH] updated setting modules to new interface Former-commit-id: 2616fa8884b9ac2f9de1e1cedb21fe6317096b99 --- src/settings/SettingsManager.cpp | 1 - src/settings/modules/RegionSettings.cpp | 2 +- src/settings/modules/RegionSettings.h | 2 +- src/settings/modules/Smt2SmtSolverSettings.cpp | 2 +- src/settings/modules/Smt2SmtSolverSettings.h | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/settings/SettingsManager.cpp b/src/settings/SettingsManager.cpp index eba862108..f94c54d41 100644 --- a/src/settings/SettingsManager.cpp +++ b/src/settings/SettingsManager.cpp @@ -31,7 +31,6 @@ #include "src/settings/modules/Smt2SmtSolverSettings.h" #include "src/settings/modules/ParametricSettings.h" #include "src/settings/modules/RegionSettings.h" -#include "src/settings/modules/SparseDtmcEliminationModelCheckerSettings.h" #include "src/settings/modules/TopologicalValueIterationEquationSolverSettings.h" #include "src/settings/modules/ExplorationSettings.h" #include "src/utility/macros.h" diff --git a/src/settings/modules/RegionSettings.cpp b/src/settings/modules/RegionSettings.cpp index 0e36af58d..9422719ca 100644 --- a/src/settings/modules/RegionSettings.cpp +++ b/src/settings/modules/RegionSettings.cpp @@ -19,7 +19,7 @@ namespace storm { const std::string RegionSettings::smtmodeOptionName = "smtmode"; const std::string RegionSettings::refinementOptionName = "refinement"; - RegionSettings::RegionSettings(storm::settings::SettingsManager& settingsManager) : ModuleSettings(settingsManager, moduleName), modesModified(false) { + RegionSettings::RegionSettings() : ModuleSettings(moduleName), modesModified(false) { this->addOption(storm::settings::OptionBuilder(moduleName, regionfileOptionName, true, "Specifies the regions via a file. Format: 0.3<=p<=0.4,0.2<=q<=0.5; 0.6<=p<=0.7,0.8<=q<=0.9") .addArgument(storm::settings::ArgumentBuilder::createStringArgument("filename", "The file from which to read the regions.") .addValidationFunctionString(storm::settings::ArgumentValidators::existingReadableFileValidator()).build()).build()); diff --git a/src/settings/modules/RegionSettings.h b/src/settings/modules/RegionSettings.h index af8e607c9..1f61c0e42 100644 --- a/src/settings/modules/RegionSettings.h +++ b/src/settings/modules/RegionSettings.h @@ -22,7 +22,7 @@ namespace storm { * * @param settingsManager The responsible manager. */ - RegionSettings(storm::settings::SettingsManager& settingsManager); + RegionSettings(); /*! * Retrieves whether the regions are specified in a file. diff --git a/src/settings/modules/Smt2SmtSolverSettings.cpp b/src/settings/modules/Smt2SmtSolverSettings.cpp index 05f0f261c..4991327fb 100644 --- a/src/settings/modules/Smt2SmtSolverSettings.cpp +++ b/src/settings/modules/Smt2SmtSolverSettings.cpp @@ -15,7 +15,7 @@ namespace storm { const std::string Smt2SmtSolverSettings::solverCommandOption = "solvercommand"; const std::string Smt2SmtSolverSettings::exportScriptOption = "exportscript"; - Smt2SmtSolverSettings::Smt2SmtSolverSettings(storm::settings::SettingsManager& settingsManager) : ModuleSettings(settingsManager, moduleName) { + Smt2SmtSolverSettings::Smt2SmtSolverSettings() : ModuleSettings(moduleName) { this->addOption(storm::settings::OptionBuilder(moduleName, solverCommandOption, true, "If set, this command is used to call the solver and to let the solver know that it should read SMT-LIBv2 commands from standard input. If not set, only a SMT-LIB script file might be exported.").addArgument(storm::settings::ArgumentBuilder::createStringArgument("command", "path to the solver + command line arguments.").setDefaultValueString("").build()).build()); this->addOption(storm::settings::OptionBuilder(moduleName, exportScriptOption, true, "If set, the SMT-LIBv2 script will be exportet to this file.").addArgument(storm::settings::ArgumentBuilder::createStringArgument("path", "path and filename to the location where the script file should be exportet to").setDefaultValueString("").build()).build()); diff --git a/src/settings/modules/Smt2SmtSolverSettings.h b/src/settings/modules/Smt2SmtSolverSettings.h index c199a99cb..a6a3da920 100644 --- a/src/settings/modules/Smt2SmtSolverSettings.h +++ b/src/settings/modules/Smt2SmtSolverSettings.h @@ -17,7 +17,7 @@ namespace storm { * * @param settingsManager The responsible manager. */ - Smt2SmtSolverSettings(storm::settings::SettingsManager& settingsManager); + Smt2SmtSolverSettings(); /*! * Retrieves whether the solver command has been set.