From 0ef06fd31b997030c865d170fd9abf6e699a093b Mon Sep 17 00:00:00 2001 From: dehnert Date: Sun, 15 Oct 2017 19:37:20 +0200 Subject: [PATCH] re-add time output to storm output and make iterative minmax solver respect linear equation solver format for policy iteration --- src/storm-cli-utilities/cli.cpp | 3 +++ src/storm/solver/IterativeMinMaxLinearEquationSolver.cpp | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/storm-cli-utilities/cli.cpp b/src/storm-cli-utilities/cli.cpp index 3ff4d4593..dfc3065b8 100644 --- a/src/storm-cli-utilities/cli.cpp +++ b/src/storm-cli-utilities/cli.cpp @@ -10,6 +10,7 @@ #include "storm/utility/Stopwatch.h" #include +#include #include "storm-cli-utilities/model-handling.h" @@ -76,6 +77,8 @@ namespace storm { std::string command = commandStream.str(); if (!command.empty()) { + std::time_t result = std::time(nullptr); + STORM_PRINT("Date: " << std::ctime(&result)); STORM_PRINT("Command line arguments: " << commandStream.str() << std::endl); STORM_PRINT("Current working directory: " << storm::utility::cli::getCurrentWorkingDirectory() << std::endl << std::endl); } diff --git a/src/storm/solver/IterativeMinMaxLinearEquationSolver.cpp b/src/storm/solver/IterativeMinMaxLinearEquationSolver.cpp index f5061580a..d756c194b 100644 --- a/src/storm/solver/IterativeMinMaxLinearEquationSolver.cpp +++ b/src/storm/solver/IterativeMinMaxLinearEquationSolver.cpp @@ -213,7 +213,9 @@ namespace storm { } else { // Update the scheduler and the solver. submatrix = this->A->selectRowsFromRowGroups(scheduler, true); - submatrix.convertToEquationSystem(); + if (convertToEquationSystem) { + submatrix.convertToEquationSystem(); + } storm::utility::vector::selectVectorValues(subB, scheduler, this->A->getRowGroupIndices(), b); solver->setMatrix(std::move(submatrix)); }