From 0f9c7537784c931ad8fab005d76f9b45fc6dfa0e Mon Sep 17 00:00:00 2001 From: David_Korzeniewski Date: Fri, 6 Feb 2015 16:41:45 +0100 Subject: [PATCH] Fixed Windows build error Former-commit-id: a59eafdaf8594c159a1b435c6050808a87d7f6e3 --- ...sticModelBisimulationDecompositionTest.cpp | 33 ++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/test/functional/storage/DeterministicModelBisimulationDecompositionTest.cpp b/test/functional/storage/DeterministicModelBisimulationDecompositionTest.cpp index 196cde5b8..63b10a03a 100644 --- a/test/functional/storage/DeterministicModelBisimulationDecompositionTest.cpp +++ b/test/functional/storage/DeterministicModelBisimulationDecompositionTest.cpp @@ -17,7 +17,11 @@ TEST(DeterministicModelBisimulationDecomposition, Die) { EXPECT_EQ(13, result->getNumberOfStates()); EXPECT_EQ(20, result->getNumberOfTransitions()); - typename storm::storage::DeterministicModelBisimulationDecomposition::Options options; +#ifdef WINDOWS + storm::storage::DeterministicModelBisimulationDecomposition::Options options; +#else + typename storm::storage::DeterministicModelBisimulationDecomposition::Options options; +#endif options.respectedAtomicPropositions = std::set({"one"}); storm::storage::DeterministicModelBisimulationDecomposition bisim2(*dtmc, options); @@ -39,8 +43,13 @@ TEST(DeterministicModelBisimulationDecomposition, Die) { auto labelFormula = std::make_shared("one"); auto eventuallyFormula = std::make_shared(labelFormula); + +#ifdef WINDOWS + storm::storage::DeterministicModelBisimulationDecomposition::Options options2(*dtmc, *eventuallyFormula); +#else + typename storm::storage::DeterministicModelBisimulationDecomposition::Options options2(*dtmc, *eventuallyFormula); +#endif - typename storm::storage::DeterministicModelBisimulationDecomposition::Options options2(*dtmc, *eventuallyFormula); storm::storage::DeterministicModelBisimulationDecomposition bisim4(*dtmc, options2); ASSERT_NO_THROW(result = bisim4.getQuotient()); EXPECT_EQ(storm::models::DTMC, result->getType()); @@ -62,7 +71,11 @@ TEST(DeterministicModelBisimulationDecomposition, Crowds) { EXPECT_EQ(334, result->getNumberOfStates()); EXPECT_EQ(546, result->getNumberOfTransitions()); - typename storm::storage::DeterministicModelBisimulationDecomposition::Options options; +#ifdef WINDOWS + storm::storage::DeterministicModelBisimulationDecomposition::Options options; +#else + typename storm::storage::DeterministicModelBisimulationDecomposition::Options options; +#endif options.respectedAtomicPropositions = std::set({"observe0Greater1"}); storm::storage::DeterministicModelBisimulationDecomposition bisim2(*dtmc, options); @@ -85,7 +98,11 @@ TEST(DeterministicModelBisimulationDecomposition, Crowds) { auto labelFormula = std::make_shared("observe0Greater1"); auto eventuallyFormula = std::make_shared(labelFormula); - typename storm::storage::DeterministicModelBisimulationDecomposition::Options options2(*dtmc, *eventuallyFormula); +#ifdef WINDOWS + storm::storage::DeterministicModelBisimulationDecomposition::Options options2(*dtmc, *eventuallyFormula); +#else + typename storm::storage::DeterministicModelBisimulationDecomposition::Options options2(*dtmc, *eventuallyFormula); +#endif storm::storage::DeterministicModelBisimulationDecomposition bisim4(*dtmc, options2); ASSERT_NO_THROW(result = bisim4.getQuotient()); @@ -95,7 +112,11 @@ TEST(DeterministicModelBisimulationDecomposition, Crowds) { auto probabilityOperatorFormula = std::make_shared(eventuallyFormula); +#ifdef WINDOWS + storm::storage::DeterministicModelBisimulationDecomposition::Options options3(*dtmc, *probabilityOperatorFormula); +#else typename storm::storage::DeterministicModelBisimulationDecomposition::Options options3(*dtmc, *probabilityOperatorFormula); +#endif storm::storage::DeterministicModelBisimulationDecomposition bisim5(*dtmc, options3); ASSERT_NO_THROW(result = bisim5.getQuotient()); @@ -105,7 +126,11 @@ TEST(DeterministicModelBisimulationDecomposition, Crowds) { auto boundedUntilFormula = std::make_shared(std::make_shared(true), labelFormula, 50); +#ifdef WINDOWS + storm::storage::DeterministicModelBisimulationDecomposition::Options options4(*dtmc, *boundedUntilFormula); +#else typename storm::storage::DeterministicModelBisimulationDecomposition::Options options4(*dtmc, *boundedUntilFormula); +#endif storm::storage::DeterministicModelBisimulationDecomposition bisim6(*dtmc, options4); ASSERT_NO_THROW(result = bisim6.getQuotient());