Browse Source

fix to compile again

Former-commit-id: c0400b2dd3 [formerly 18685c4259]
Former-commit-id: 4806097817
tempestpy_adaptions
dehnert 8 years ago
parent
commit
ad96b81a8a
  1. 4
      src/adapters/DereferenceIteratorAdapter.h
  2. 10
      src/generator/JaniNextStateGenerator.cpp

4
src/adapters/DereferenceIteratorAdapter.h

@ -42,11 +42,11 @@ namespace storm {
}
decltype((*std::declval<value_type>())) front() const {
return *it;
return **it;
}
decltype((*std::declval<value_type>())) back() const {
return *(ite - 1);
return **(ite - 1);
}
std::size_t size() const {

10
src/generator/JaniNextStateGenerator.cpp

@ -64,8 +64,8 @@ namespace storm {
if (rewardVariables.empty() && !this->options.getRewardModelNames().empty()) {
bool foundTransientVariable = false;
for (auto const& transientVariable : globalVariables.getTransientVariables()) {
if (transientVariable->isUnboundedIntegerVariable() || transientVariable->isRealVariable()) {
rewardVariables.push_back(transientVariable->getExpressionVariable());
if (transientVariable.isUnboundedIntegerVariable() || transientVariable.isRealVariable()) {
rewardVariables.push_back(transientVariable.getExpressionVariable());
foundTransientVariable = true;
break;
}
@ -632,9 +632,9 @@ namespace storm {
// create a list of boolean transient variables and the expressions that define them.
std::unordered_map<storm::expressions::Variable, storm::expressions::Expression> transientVariableToExpressionMap;
for (auto const& variable : model.getGlobalVariables().getTransientVariables()) {
if (variable->isBooleanVariable()) {
if (this->options.isBuildAllLabelsSet() || this->options.getLabelNames().find(variable->getName()) != this->options.getLabelNames().end()) {
transientVariableToExpressionMap[variable->getExpressionVariable()] = model.getLabelExpression(variable->asBooleanVariable(), locationVariables);
if (variable.isBooleanVariable()) {
if (this->options.isBuildAllLabelsSet() || this->options.getLabelNames().find(variable.getName()) != this->options.getLabelNames().end()) {
transientVariableToExpressionMap[variable.getExpressionVariable()] = model.getLabelExpression(variable.asBooleanVariable(), locationVariables);
}
}
}

Loading…
Cancel
Save