From e79035c71b30a8a35bd518a4a2e48fbae9fa188d Mon Sep 17 00:00:00 2001
From: Tim Quatmann <tim.quatmann@cs.rwth-aachen.de>
Date: Mon, 2 Mar 2020 08:54:42 +0100
Subject: [PATCH] Enabled short circuit optimization for & (and) and | (or) in
 ExprtkExpressionEvaluator

---
 src/storm/storage/expressions/ToExprtkStringVisitor.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/storm/storage/expressions/ToExprtkStringVisitor.cpp b/src/storm/storage/expressions/ToExprtkStringVisitor.cpp
index b3b0df9c3..2f1b2c947 100644
--- a/src/storm/storage/expressions/ToExprtkStringVisitor.cpp
+++ b/src/storm/storage/expressions/ToExprtkStringVisitor.cpp
@@ -29,14 +29,14 @@ namespace storm {
                 case BinaryBooleanFunctionExpression::OperatorType::And:
                     stream << "(";
                     expression.getFirstOperand()->accept(*this, data);
-                    stream << " and ";
+                    stream << " & ";
                     expression.getSecondOperand()->accept(*this, data);
                     stream << ")";
                     break;
                 case BinaryBooleanFunctionExpression::OperatorType::Or:
                     stream << "(";
                     expression.getFirstOperand()->accept(*this, data);
-                    stream << " or ";
+                    stream << " | ";
                     expression.getSecondOperand()->accept(*this, data);
                     stream << ")";
                     break;
@@ -50,7 +50,7 @@ namespace storm {
                 case BinaryBooleanFunctionExpression::OperatorType::Implies:
                     stream << "(not(";
                     expression.getFirstOperand()->accept(*this, data);
-                    stream << ") or ";
+                    stream << ") | ";
                     expression.getSecondOperand()->accept(*this, data);
                     stream << ")";
                     break;