From f7965cfc124c9e899b49cfeedff99ea6633ed4a5 Mon Sep 17 00:00:00 2001
From: dehnert <dehnert@cs.rwth-aachen.de>
Date: Fri, 2 Jun 2017 11:29:16 +0200
Subject: [PATCH] minor cleanup

---
 src/storm/api/properties.cpp | 7 +++++--
 src/storm/api/properties.h   | 2 +-
 src/storm/cli/cli.cpp        | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/storm/api/properties.cpp b/src/storm/api/properties.cpp
index 64c6db26e..f6a2d00e3 100644
--- a/src/storm/api/properties.cpp
+++ b/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;
         }
diff --git a/src/storm/api/properties.h b/src/storm/api/properties.h
index 2104cdb08..bcc1a8882 100644
--- a/src/storm/api/properties.h
+++ b/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);
diff --git a/src/storm/cli/cli.cpp b/src/storm/cli/cli.cpp
index e36cd13c2..6d1f8020a 100644
--- a/src/storm/cli/cli.cpp
+++ b/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;
         }