From 0ee383390d791d7cc6d52d191028ea30d12f8ab4 Mon Sep 17 00:00:00 2001
From: Stefan Pranger <stefan.pranger@student.tugraz.at>
Date: Wed, 23 Dec 2020 11:02:42 +0100
Subject: [PATCH] fixed call of inherited function and

short curcuiting problem. Maybe && is overloaded somewhere?
---
 src/storm/solver/GmmxxMultiplier.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/storm/solver/GmmxxMultiplier.cpp b/src/storm/solver/GmmxxMultiplier.cpp
index 15b1aefbd..32af42f72 100644
--- a/src/storm/solver/GmmxxMultiplier.cpp
+++ b/src/storm/solver/GmmxxMultiplier.cpp
@@ -221,7 +221,7 @@ namespace storm {
                             oldSelectedChoiceValue = newValue;
                         }
 
-                        if(isOverridden(currentRowGroup) ? !compare(newValue, currentValue) : compare(newValue, currentValue)) {
+                        if(this->isOverridden(currentRowGroup) ? !compare(newValue, currentValue) : compare(newValue, currentValue)) {
                             currentValue = newValue;
                             if (choices) {
                                 selectedChoice = currentRow - *row_group_it;
@@ -241,8 +241,10 @@ namespace storm {
 
                     // Finally write value to target vector.
                     *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;
+                        }
                     }
                 }