sp
/
tempest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

log improvements + minor bugfixes for qvi

tempestpy_adaptions
TimQu 7 years ago
parent
f65bb48195
commit
116bd58b22
1 changed files with 4 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/storm/solver/IterativeMinMaxLinearEquationSolver.cpp

6
src/storm/solver/IterativeMinMaxLinearEquationSolver.cpp
View File

@ -257,6 +257,7 @@ namespace storm {
if (!this->hasUniqueSolution()) { if (!this->hasUniqueSolution()) {
requirements.requireNoEndComponents(); requirements.requireNoEndComponents();
} }
requirements.requireBounds();
} else { } else {
STORM_LOG_THROW(false, storm::exceptions::InvalidEnvironmentException, "Unsupported technique for iterative MinMax linear equation solver."); STORM_LOG_THROW(false, storm::exceptions::InvalidEnvironmentException, "Unsupported technique for iterative MinMax linear equation solver.");
} }
@ -686,6 +687,7 @@ namespace storm {
// If minimizing, the primary bound is the lower bound; if maximizing, the primary bound is the upper bound. // If minimizing, the primary bound is the lower bound; if maximizing, the primary bound is the upper bound.
ValueType& primaryBound = minimize(dir) ? currentLowerBound : currentUpperBound; ValueType& primaryBound = minimize(dir) ? currentLowerBound : currentUpperBound;
bool& hasPrimaryBound = minimize(dir) ? hasCurrentLowerBound : hasCurrentUpperBound; bool& hasPrimaryBound = minimize(dir) ? hasCurrentLowerBound : hasCurrentUpperBound;
STORM_LOG_INFO_COND(!hasPrimaryBound, "Initial bound on the result is " << primaryBound);
// Proceed with the iterations as long as the method did not converge or reach the maximum number of iterations. // Proceed with the iterations as long as the method did not converge or reach the maximum number of iterations.
SolverStatus status = SolverStatus::InProgress; SolverStatus status = SolverStatus::InProgress;
@ -733,7 +735,7 @@ namespace storm {
ValueType bestValue = yTmp.front(); ValueType bestValue = yTmp.front();
for (uint64_t choice = 1; choice < xTmp.size(); ++choice) { for (uint64_t choice = 1; choice < xTmp.size(); ++choice) {
ValueType const& value = yTmp[choice]; ValueType const& value = yTmp[choice];
if (betterEqual(value, bestValue) && (value != bestValue || better(xTmp[choice], xTmp[bestChoice]))) {
if (value >= bestValue && (value != bestValue || better(xTmp[choice], xTmp[bestChoice]))) {
bestValue = std::move(value); bestValue = std::move(value);
bestChoice = choice; bestChoice = choice;
} }
@ -749,7 +751,7 @@ namespace storm {
if (deltaY > storm::utility::zero<ValueType>()) { if (deltaY > storm::utility::zero<ValueType>()) {
ValueType newDecisionValue = (xTmp[choice] - *xIt) / deltaY; ValueType newDecisionValue = (xTmp[choice] - *xIt) / deltaY;
if (!hasDecisionValue || better(newDecisionValue, decisionValue)) { if (!hasDecisionValue || better(newDecisionValue, decisionValue)) {
// std::cout << "Updating decision value to " << newDecisionValue << ", where deltaX = " << xTmp[choice] << " - " << *xIt << " = " << (xTmp[choice] - *xIt) << " and deltaY= " << *yIt << " - " << yTmp[choice] << " = " << deltaY << "." << std::endl;
// std::cout << "Updating decision value in Iteration " << iterations << " to " << newDecisionValue << ", where deltaX = " << xTmp[choice] << " - " << *xIt << " = " << (xTmp[choice] - *xIt) << " and deltaY= " << *yIt << " - " << yTmp[choice] << " = " << deltaY << "." << std::endl;
decisionValue = std::move(newDecisionValue); decisionValue = std::move(newDecisionValue);
hasDecisionValue = true; hasDecisionValue = true;
} }

Write Preview
Loading…
Cancel
Save