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

Modules can now be registered and options (should) get parsed correctly. 

Former-commit-id: 363d2626ab
tempestpy_adaptions
dehnert 10 years ago
parent
1cd01e3f28
commit
01697a8939
5 changed files with 164 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/settings/Option.h
  2. 98
      src/settings/SettingsManager.cpp
  3. 31
      src/settings/SettingsManager.h
  4. 11
      src/settings/modules/ModuleSettings.cpp
  5. 21
      src/settings/modules/ModuleSettings.h

20
src/settings/Option.h
View File

@ -122,6 +122,17 @@ namespace storm {
LOG_THROW(argumentIndex < this->getArgumentCount(), storm::exceptions::IllegalArgumentException, "Index of argument is out of bounds.");
return *this->arguments.at(argumentIndex);
}
/*!
* Retrieves the i-th argument of this option.
*
* @param argumentIndex The index of the argument to retrieve.
* @return The i-th argument of this option.
*/
ArgumentBase& getArgument(uint_fast64_t argumentIndex) {
LOG_THROW(argumentIndex < this->getArgumentCount(), storm::exceptions::IllegalArgumentException, "Index of argument is out of bounds.");
return *this->arguments.at(argumentIndex);
}
/*!
* Returns a reference to the argument with the specified long name.
@ -189,6 +200,15 @@ namespace storm {
return this->isRequired;
}
/*!
* Retrieves whether the option requires the module name as a prefix.
*
* @return True iff the option requires the module name as a prefix.
*/
bool getRequiresModulePrefix() const {
return this->requiresModulePrefix;
}
/*!
* Retrieves whether the option has been set.
*

98
src/settings/SettingsManager.cpp
View File

@ -5,12 +5,13 @@
#include <mutex>
#include <boost/algorithm/string.hpp>
#include "src/exceptions/IllegalFunctionCallException.h"
#include "src/exceptions/OptionParserException.h"
namespace storm {
namespace settings {
SettingsManager::SettingsManager() {
SettingsManager::SettingsManager() : modules(), longNameToOptions(), shortNameToOptions(), moduleOptions() {
// Register all known settings modules.
this->addModule(std::unique_ptr<modules::ModuleSettings>(new modules::GeneralSettings(*this)));
this->addModule(std::unique_ptr<modules::ModuleSettings>(new modules::DebugSettings(*this)));
@ -49,7 +50,47 @@ namespace storm {
}
void SettingsManager::setFromExplodedString(std::vector<std::string> const& commandLineArguments) {
LOG_ASSERT(false, "Not yet implemented");
// In order to assign the parsed arguments to an option, we need to keep track of the "active" option's name.
bool optionActive = false;
bool activeOptionIsShortName = false;
std::string activeOptionName = "";
std::vector<std::string> argumentCache;
// Walk through all arguments.
for (uint_fast64_t i = 0; i < commandLineArguments.size(); ++i) {
bool existsNextArgument = i < commandLineArguments.size() - 1;
std::string const& currentArgument = commandLineArguments[i];
// Check if the given argument is a new option or belongs to a previously given option.
if (currentArgument.at(0) == '-') {
// At this point we know that a new option is about to come. Hence, we need to assign the current
// cache content to the option that was active until now.
this->setOptionsArguments(activeOptionName, activeOptionIsShortName ? this->longNameToOptions : this->shortNameToOptions, argumentCache);
if (currentArgument.at(1) == '-') {
// In this case, the argument has to be the long name of an option. Try to get all options that
// match the long name.
std::string optionName = currentArgument.substr(2);
auto optionIterator = this->longNameToOptions.find(optionName);
LOG_THROW(optionIterator != this->longNameToOptions.end(), storm::exceptions::OptionParserException, "Unknown option '" << optionName << "'.");
activeOptionIsShortName = false;
activeOptionName = optionName;
} else {
// In this case, the argument has to be the short name of an option. Try to get all options that
// match the short name.
std::string optionName = currentArgument.substr(1);
auto optionIterator = this->shortNameToOptions.find(optionName);
LOG_THROW(optionIterator != this->shortNameToOptions.end(), storm::exceptions::OptionParserException, "Unknown option '" << optionName << "'.");
activeOptionIsShortName = true;
activeOptionName = optionName;
}
} else if (optionActive) {
// Add the current argument to the list of arguments for the currently active options.
argumentCache.push_back(currentArgument);
} else {
LOG_THROW(false, storm::exceptions::OptionParserException, "Found stray argument '" << currentArgument << "' that is not preceeded by a matching option.");
}
}
}
void SettingsManager::setFromConfigurationFile(std::string const& configFilename) {
@ -61,8 +102,59 @@ namespace storm {
}
void SettingsManager::addModule(std::unique_ptr<modules::ModuleSettings>&& moduleSettings) {
LOG_ASSERT(false, "Not yet implemented");
auto moduleIterator = this->modules.find(moduleSettings->getModuleName());
LOG_THROW(moduleIterator == this->modules.end(), storm::exceptions::IllegalFunctionCallException, "Unable to register module '" << moduleSettings->getModuleName() << "' because a module with the same name already exists.");
this->modules.emplace(moduleSettings->getModuleName(), std::move(moduleSettings));
for (auto const& option : moduleSettings->getOptions()) {
this->addOption(option);
}
}
void SettingsManager::addOption(std::shared_ptr<Option> const& option) {
// First, we register to which module the given option belongs.
auto moduleOptionIterator = this->moduleOptions.find(option->getModuleName());
LOG_THROW(moduleOptionIterator != this->moduleOptions.end(), storm::exceptions::IllegalFunctionCallException, "Cannot add option for unknown module '" << option->getModuleName() << "'.");
moduleOptionIterator->second.emplace_back(option);
// Then, we add the option's name (and possibly short name) to the registered options. If a module prefix is
// not required for this option, we have to add both versions to our mappings, the prefixed one and the
// non-prefixed one.
if (!option->getRequiresModulePrefix()) {
this->longNameToOptions.emplace(option->getLongName(), option);
}
this->longNameToOptions.emplace(option->getModuleName() + ":" + option->getLongName(), option);
if (option->getHasShortName()) {
if (!option->getRequiresModulePrefix()) {
this->shortNameToOptions.emplace(option->getLongName(), option);
}
this->shortNameToOptions.emplace(option->getModuleName() + ":" + option->getShortName(), option);
}
}
void SettingsManager::setOptionsArguments(std::string const& optionName, std::unordered_map<std::string, std::vector<std::shared_ptr<Option>>> const& optionMap, std::vector<std::string> const& argumentCache) {
auto optionIterator = optionMap.find(optionName);
LOG_THROW(optionIterator != optionMap.end(), storm::exceptions::OptionParserException, "Unknown option '" << optionName << "'.");
// Iterate over all options and set the arguments.
for (auto& option : optionIterator->second) {
option->setHasOptionBeenSet();
LOG_THROW(option->getArgumentCount() <= argumentCache.size(), storm::exceptions::OptionParserException, "Unknown option '" << optionName << "'.");
// Now set the provided argument values one by one.
for (uint_fast64_t i = 0; i < argumentCache.size(); ++i) {
ArgumentBase& argument = option->getArgument(i);
argument.setFromStringValue(argumentCache[i]);
}
// In case there are optional arguments that were not set, we set them to their default value.
for (uint_fast64_t i = argumentCache.size(); i < option->getArgumentCount(); ++i) {
ArgumentBase& argument = option->getArgument(i);
argument.setFromDefaultValue();
}
}
}
}
}

31
src/settings/SettingsManager.h
View File

@ -119,17 +119,32 @@ namespace storm {
*/
virtual ~SettingsManager();
// A set of all known (i.e. registered) module names.
std::set<std::string> moduleNames;
// The registered modules.
std::unordered_map<std::string, std::unique_ptr<modules::ModuleSettings>> modules;
// A mapping from all known option names to the options that match it. All options for one option name need
// Mappings from all known option names to the options that match it. All options for one option name need
// to be compatible in the sense that calling isCompatible(...) pairwise on all options must always return true.
std::unordered_map<std::string, std::vector<std::shared_ptr<Option>>> options;
std::unordered_map<std::string, std::vector<std::shared_ptr<Option>>> longNameToOptions;
std::unordered_map<std::string, std::vector<std::shared_ptr<Option>>> shortNameToOptions;
// Helper functions
void handleAssignment(std::string const& longOptionName, std::vector<std::string> arguments);
std::vector<bool> scanForOptions(std::vector<std::string> const& arguments);
bool checkArgumentSyntaxForOption(std::string const& argvString);
// A mapping of module names to the corresponding options.
std::unordered_map<std::string, std::vector<std::shared_ptr<Option>>> moduleOptions;
/*!
* Adds the given option to the known options.
*
* @param option The option to add.
*/
void addOption(std::shared_ptr<Option> const& option);
/*!
* Sets the arguments of the options matching the given name from the provided strings.
*
* @param optionName The name of the options for which to set the arguments.
* @param optionMap The mapping from option names to options.
* @param argumentCache The arguments of the option as string values.
*/
void setOptionsArguments(std::string const& optionName, std::unordered_map<std::string, std::vector<std::shared_ptr<Option>>> const& optionMap, std::vector<std::string> const& argumentCache);
};
/*!

11
src/settings/modules/ModuleSettings.cpp
View File

@ -24,6 +24,17 @@ namespace storm {
return this->getOption(name).setHasOptionBeenSet(false);
}
std::vector<std::shared_ptr<Option>> ModuleSettings::getOptions() const {
std::vector<std::shared_ptr<Option>> result;
result.reserve(this->options.size());
for (auto const& option : this->options) {
result.push_back(option.second);
}
return result;
}
} // namespace modules
} // namespace settings
} // namespace storm

21
src/settings/modules/ModuleSettings.h
View File

@ -48,6 +48,20 @@ namespace storm {
*/
std::unique_ptr<storm::settings::SettingMemento> overrideOption(std::string const& name, bool requiredStatus);
/*!
* Retrieves the name of the module to which these settings belong.
*
* @return The name of the module.
*/
std::string const& getModuleName() const;
/*!
* Retrieves the options of this module.
*
* @return A list of options of this module.
*/
std::vector<std::shared_ptr<Option>> getOptions() const;
protected:
/*!
* Retrieves the manager responsible for the settings.
@ -56,11 +70,6 @@ namespace storm {
*/
storm::settings::SettingsManager const& getSettingsManager() const;
/*!
* Retrieves the name of the module to which these settings belong.
*/
std::string const& getModuleName() const;
/*!
* Retrieves the option with the given long name. If no such option exists, an exception is thrown.
*
@ -98,7 +107,7 @@ namespace storm {
*
* @param option The option to add and register.
*/
void addAndRegisterOption(std::shared_ptr<Option> option) const;
void addOption(std::shared_ptr<Option> option) const;
private:
// The settings manager responsible for the settings.

Write Preview
Loading…
Cancel
Save