Browse Source

re-add time output to storm output and make iterative minmax solver respect linear equation solver format for policy iteration

tempestpy_adaptions
dehnert 7 years ago
parent
commit
0ef06fd31b
  1. 3
      src/storm-cli-utilities/cli.cpp
  2. 4
      src/storm/solver/IterativeMinMaxLinearEquationSolver.cpp

3
src/storm-cli-utilities/cli.cpp

@ -10,6 +10,7 @@
#include "storm/utility/Stopwatch.h"
#include <type_traits>
#include <ctime>
#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);
}

4
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<ValueType>(subB, scheduler, this->A->getRowGroupIndices(), b);
solver->setMatrix(std::move(submatrix));
}

Loading…
Cancel
Save