Browse Source

fixed call of inherited function and

short curcuiting problem. Maybe && is overloaded somewhere?
tempestpy_adaptions
Stefan Pranger 4 years ago
parent
commit
b3f5cd1c89
  1. 8
      src/storm/solver/GmmxxMultiplier.cpp

8
src/storm/solver/GmmxxMultiplier.cpp

@ -221,7 +221,7 @@ namespace storm {
oldSelectedChoiceValue = newValue; oldSelectedChoiceValue = newValue;
} }
if(isOverridden(currentRowGroup) ? !compare(newValue, currentValue) : compare(newValue, currentValue)) {
if(this->isOverridden(currentRowGroup) ? !compare(newValue, currentValue) : compare(newValue, currentValue)) {
currentValue = newValue; currentValue = newValue;
if (choices) { if (choices) {
selectedChoice = currentRow - *row_group_it; selectedChoice = currentRow - *row_group_it;
@ -241,8 +241,10 @@ namespace storm {
// Finally write value to target vector. // Finally write value to target vector.
*target_it = currentValue; *target_it = currentValue;
if(choices && isOverridden(currentRowGroup) ? !compare(currentValue, oldSelectedChoiceValue) : compare(currentValue, oldSelectedChoiceValue) ) {
*choice_it = selectedChoice;
if(choices) {
if(this->isOverridden(currentRowGroup) ? !compare(currentValue, oldSelectedChoiceValue) : compare(currentValue, oldSelectedChoiceValue) ) {
*choice_it = selectedChoice;
}
} }
} }

Loading…
Cancel
Save