Browse Source

minor cleanup

tempestpy_adaptions
dehnert 8 years ago
parent
commit
f7965cfc12
  1. 7
      src/storm/api/properties.cpp
  2. 2
      src/storm/api/properties.h
  3. 4
      src/storm/cli/cli.cpp

7
src/storm/api/properties.cpp

@ -14,8 +14,11 @@
namespace storm {
namespace api {
boost::optional<std::set<std::string>> parsePropertyFilter(boost::optional<std::string> const& propertyFilter) {
std::vector<std::string> propertyNames = storm::utility::cli::parseCommaSeparatedStrings(propertyFilter.get());
boost::optional<std::set<std::string>> parsePropertyFilter(std::string const& propertyFilter) {
if (propertyFilter == "all") {
return boost::none;
}
std::vector<std::string> propertyNames = storm::utility::cli::parseCommaSeparatedStrings(propertyFilter);
std::set<std::string> propertyNameSet(propertyNames.begin(), propertyNames.end());
return propertyNameSet;
}

2
src/storm/api/properties.h

@ -29,7 +29,7 @@ namespace storm {
}
namespace api {
boost::optional<std::set<std::string>> parsePropertyFilter(boost::optional<std::string> const& propertyFilter);
boost::optional<std::set<std::string>> parsePropertyFilter(std::string const& propertyFilter);
// Parsing properties.
std::vector<storm::jani::Property> parseProperties(storm::parser::FormulaParser& formulaParser, std::string const& inputString, boost::optional<std::set<std::string>> const& propertyFilter = boost::none);

4
src/storm/cli/cli.cpp

@ -390,7 +390,7 @@ namespace storm {
modelBuildingWatch.stop();
if (result) {
STORM_PRINT_AND_LOG("Time for model construction: " << modelBuildingWatch << "." << std::endl);
STORM_PRINT_AND_LOG("Time for model construction: " << modelBuildingWatch << "." << std::endl << std::endl);
}
return result;
@ -483,7 +483,7 @@ namespace storm {
}
if (result.second) {
STORM_PRINT_AND_LOG(std::endl << "Time for model preprocessing: " << preprocessingWatch << "." << std::endl);
STORM_PRINT_AND_LOG(std::endl << "Time for model preprocessing: " << preprocessingWatch << "." << std::endl << std::endl);
}
return result;
}

Loading…
Cancel
Save