From 7f102c915bca0bffd2e5f1572b1e993046d2c2f7 Mon Sep 17 00:00:00 2001 From: Tim Quatmann Date: Wed, 25 Mar 2020 10:58:19 +0100 Subject: [PATCH] Improved some output --- src/storm-pomdp-cli/storm-pomdp.cpp | 10 ++++++---- .../modelchecker/ApproximatePOMDPModelchecker.cpp | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/storm-pomdp-cli/storm-pomdp.cpp b/src/storm-pomdp-cli/storm-pomdp.cpp index fa23bbb77..b18f77933 100644 --- a/src/storm-pomdp-cli/storm-pomdp.cpp +++ b/src/storm-pomdp-cli/storm-pomdp.cpp @@ -122,14 +122,14 @@ namespace storm { checker.printStatisticsToStream(std::cout); if (result) { if (storm::utility::resources::isTerminate()) { - STORM_PRINT_AND_LOG("Result till abort: ") + STORM_PRINT_AND_LOG("\nResult till abort: ") } else { - STORM_PRINT_AND_LOG("Result: ") + STORM_PRINT_AND_LOG("\nResult: ") } printResult(result->underApproxValue, result->overApproxValue); STORM_PRINT_AND_LOG(std::endl); } else { - STORM_PRINT_AND_LOG("Result: Not available." << std::endl); + STORM_PRINT_AND_LOG("\nResult: Not available." << std::endl); } analysisPerformed = true; } @@ -157,7 +157,9 @@ namespace storm { STORM_PRINT_AND_LOG("Analyzing the formula on the fully observable MDP ... "); auto result = storm::api::verifyWithSparseEngine(pomdp->template as>(), storm::api::createTask(formula.asSharedPointer(), true))->template asExplicitQuantitativeCheckResult(); result.filter(storm::modelchecker::ExplicitQualitativeCheckResult(pomdp->getInitialStates())); - STORM_PRINT_AND_LOG("Result: " << result.getMax() << std::endl); + STORM_PRINT_AND_LOG("\nResult: "); + printResult(result.getMin(), result.getMax()); + STORM_PRINT_AND_LOG(std::endl); analysisPerformed = true; } return analysisPerformed; diff --git a/src/storm-pomdp/modelchecker/ApproximatePOMDPModelchecker.cpp b/src/storm-pomdp/modelchecker/ApproximatePOMDPModelchecker.cpp index 7c3926db1..b511b386d 100644 --- a/src/storm-pomdp/modelchecker/ApproximatePOMDPModelchecker.cpp +++ b/src/storm-pomdp/modelchecker/ApproximatePOMDPModelchecker.cpp @@ -99,7 +99,7 @@ namespace storm { // Refinement information: if (statistics.refinementSteps) { - stream << "# Number of refinement steps " << statistics.refinementSteps.get(); + stream << "# Number of refinement steps: " << statistics.refinementSteps.get(); } // The overapproximation MDP: