From 641c09dcfaade8676ce605db1e76b6cd0cb12acc Mon Sep 17 00:00:00 2001 From: David_Korzeniewski Date: Tue, 15 Oct 2013 20:44:08 +0200 Subject: [PATCH] Fixed compile errors on windows caused by missing includes and use of initializer lists (not supported by vs11) Former-commit-id: 294c26cd64596013e56d3bea16d30bc02474992e --- src/adapters/ExplicitModelAdapter.h | 5 ++++- src/adapters/Z3ExpressionAdapter.h | 1 + src/storage/LabeledValues.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/adapters/ExplicitModelAdapter.h b/src/adapters/ExplicitModelAdapter.h index 9696d9a33..7c41ee0c6 100644 --- a/src/adapters/ExplicitModelAdapter.h +++ b/src/adapters/ExplicitModelAdapter.h @@ -309,7 +309,10 @@ namespace storm { // Update the choice by adding the probability/target state to it. double probabilityToAdd = update.getLikelihoodExpression()->getValueAsDouble(currentState); probabilitySum += probabilityToAdd; - addProbabilityToChoice(choice, flagTargetStateIndexPair.second, probabilityToAdd, {update.getGlobalIndex()}); + std::set lables; + lables.insert(update.getGlobalIndex()); + //addProbabilityToChoice(choice, flagTargetStateIndexPair.second, probabilityToAdd, {update.getGlobalIndex()}); + addProbabilityToChoice(choice, flagTargetStateIndexPair.second, probabilityToAdd, lables); } // Check that the resulting distribution is in fact a distribution. diff --git a/src/adapters/Z3ExpressionAdapter.h b/src/adapters/Z3ExpressionAdapter.h index 211baa2f1..3b15fd007 100644 --- a/src/adapters/Z3ExpressionAdapter.h +++ b/src/adapters/Z3ExpressionAdapter.h @@ -11,6 +11,7 @@ #include #include "src/ir/expressions/ExpressionVisitor.h" +#include "src/ir/expressions/Expressions.h" namespace storm { namespace adapters { diff --git a/src/storage/LabeledValues.h b/src/storage/LabeledValues.h index 25f39d9b5..8ebb5ec45 100644 --- a/src/storage/LabeledValues.h +++ b/src/storage/LabeledValues.h @@ -9,6 +9,7 @@ #define STORM_STORAGE_LABELEDVALUES_H #include +#include namespace storm { namespace utility {