|
@ -1200,8 +1200,8 @@ namespace storm { |
|
|
solver.add(variableInformation.auxiliaryVariables.back()); |
|
|
solver.add(variableInformation.auxiliaryVariables.back()); |
|
|
variableInformation.auxiliaryVariables.push_back(assertLessOrEqualKRelaxed(solver, variableInformation, ++currentBound)); |
|
|
variableInformation.auxiliaryVariables.push_back(assertLessOrEqualKRelaxed(solver, variableInformation, ++currentBound)); |
|
|
assumption = !variableInformation.auxiliaryVariables.back(); |
|
|
assumption = !variableInformation.auxiliaryVariables.back(); |
|
|
if (currentBound > (1 << variableInformation.minimalityLabelVariables.size())) { |
|
|
|
|
|
STORM_LOG_DEBUG("Constraint system fully explored: Bound exceeds maximum of " << (1 << variableInformation.minimalityLabelVariables.size())); |
|
|
|
|
|
|
|
|
if (currentBound > variableInformation.minimalityLabelVariables.size()) { |
|
|
|
|
|
STORM_LOG_DEBUG("Constraint system fully explored: Bound exceeds maximum of " << variableInformation.minimalityLabelVariables.size()); |
|
|
return boost::none; |
|
|
return boost::none; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
@ -1525,11 +1525,6 @@ namespace storm { |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if (rewardName) { |
|
|
|
|
|
auto const &origRewModel = model.getRewardModel(rewardName.get()); |
|
|
|
|
|
assert(origRewModel.hasOnlyStateRewards()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
std::shared_ptr<storm::models::sparse::Model<T>> resultModel; |
|
|
std::shared_ptr<storm::models::sparse::Model<T>> resultModel; |
|
|
if (model.isOfType(storm::models::ModelType::Dtmc)) { |
|
|
if (model.isOfType(storm::models::ModelType::Dtmc)) { |
|
|
resultModel = std::make_shared<storm::models::sparse::Dtmc<T>>(transitionMatrixBuilder.build(), storm::models::sparse::StateLabeling(model.getStateLabeling()), model.getRewardModels()); |
|
|
resultModel = std::make_shared<storm::models::sparse::Dtmc<T>>(transitionMatrixBuilder.build(), storm::models::sparse::StateLabeling(model.getStateLabeling()), model.getRewardModels()); |
|
|