Merge branch 'master' into prism-parser-improvements

src/storm-cli-utilities/model-handling.h

@@ -824,12 +824,16 @@ namespace storm {
                                         },
                                         [&sparseModel,&ioSettings] (std::unique_ptr<storm::modelchecker::CheckResult> const& result) {
                                             if (ioSettings.isExportSchedulerSet()) {
-                                                if (result->template asExplicitQuantitativeCheckResult<ValueType>().hasScheduler()) {
-                                                    auto const& scheduler = result->template asExplicitQuantitativeCheckResult<ValueType>().getScheduler();
-                                                    STORM_PRINT_AND_LOG("Exporting scheduler ... ")
-                                                    storm::api::exportScheduler(sparseModel, scheduler, ioSettings.getExportSchedulerFilename());
+                                                if (result->isExplicitQuantitativeCheckResult()) {
+                                                    if (result->template asExplicitQuantitativeCheckResult<ValueType>().hasScheduler()) {
+                                                        auto const& scheduler = result->template asExplicitQuantitativeCheckResult<ValueType>().getScheduler();
+                                                        STORM_PRINT_AND_LOG("Exporting scheduler ... ")
+                                                        storm::api::exportScheduler(sparseModel, scheduler, ioSettings.getExportSchedulerFilename());
+                                                    } else {
+                                                        STORM_LOG_ERROR("Scheduler requested but could not be generated.");
+                                                    }
                                                 } else {
-                                                    STORM_LOG_ERROR("Scheduler requested but could not be generated.");
+                                                    STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "Scheduler export not supported for this property.");
                                                 }
                                             }
                                         });

src/storm/models/sparse/Model.cpp

@@ -350,8 +350,9 @@ namespace storm {
                             if (includeLabeling || firstValue != nullptr || secondValue != nullptr || hasStateValuations()) {
                                 outStream << "label = \"" << state;
                                 if (hasStateValuations()) {
+                                    std::string stateInfo = getStateValuations().getStateInfo(state);
                                     std::vector<std::string> results;
-                                    boost::split(results, getStateValuations().getStateInfo(state), [](char c) { return c == ',';});
+                                    boost::split(results, stateInfo, [](char c) { return c == ',';});
                                     storm::utility::outputFixedWidth(outStream, results, maxWidthLabel);
                                 }
                                 outStream << ": ";