From 7833025829402ad4e65822a7f38b4627e23d60c2 Mon Sep 17 00:00:00 2001 From: dehnert Date: Tue, 3 Nov 2015 20:11:23 +0100 Subject: [PATCH] reenabled all bisimulation tests Former-commit-id: 24e8629270ddc3e00de1e4ed4cb4c94b23664246 --- ...sticModelBisimulationDecompositionTest.cpp | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/test/functional/storage/DeterministicModelBisimulationDecompositionTest.cpp b/test/functional/storage/DeterministicModelBisimulationDecompositionTest.cpp index 3bb1b97e7..a706475bd 100644 --- a/test/functional/storage/DeterministicModelBisimulationDecompositionTest.cpp +++ b/test/functional/storage/DeterministicModelBisimulationDecompositionTest.cpp @@ -35,16 +35,16 @@ TEST(DeterministicModelBisimulationDecomposition, Die) { EXPECT_EQ(5ul, result->getNumberOfStates()); EXPECT_EQ(8ul, result->getNumberOfTransitions()); -// options.bounded = false; -// options.type = storm::storage::BisimulationType::Weak; -// -// storm::storage::DeterministicModelBisimulationDecomposition> bisim3(*dtmc, options); -// ASSERT_NO_THROW(bisim3.computeBisimulationDecomposition()); -// ASSERT_NO_THROW(result = bisim3.getQuotient()); -// -// EXPECT_EQ(storm::models::ModelType::Dtmc, result->getType()); -// EXPECT_EQ(5ul, result->getNumberOfStates()); -// EXPECT_EQ(8ul, result->getNumberOfTransitions()); + options.bounded = false; + options.type = storm::storage::BisimulationType::Weak; + + storm::storage::DeterministicModelBisimulationDecomposition> bisim3(*dtmc, options); + ASSERT_NO_THROW(bisim3.computeBisimulationDecomposition()); + ASSERT_NO_THROW(result = bisim3.getQuotient()); + + EXPECT_EQ(storm::models::ModelType::Dtmc, result->getType()); + EXPECT_EQ(5ul, result->getNumberOfStates()); + EXPECT_EQ(8ul, result->getNumberOfTransitions()); auto labelFormula = std::make_shared("one"); auto eventuallyFormula = std::make_shared(labelFormula); @@ -93,17 +93,17 @@ TEST(DeterministicModelBisimulationDecomposition, Crowds) { EXPECT_EQ(65ul, result->getNumberOfStates()); EXPECT_EQ(105ul, result->getNumberOfTransitions()); -// options.bounded = false; -// options.type = storm::storage::BisimulationType::Weak; -// -// storm::storage::DeterministicModelBisimulationDecomposition> bisim3(*dtmc, options); -// ASSERT_NO_THROW(bisim3.computeBisimulationDecomposition()); -// ASSERT_NO_THROW(result = bisim3.getQuotient()); -// -// EXPECT_EQ(storm::models::ModelType::Dtmc, result->getType()); -// EXPECT_EQ(43ul, result->getNumberOfStates()); -// EXPECT_EQ(83ul, result->getNumberOfTransitions()); -// + options.bounded = false; + options.type = storm::storage::BisimulationType::Weak; + + storm::storage::DeterministicModelBisimulationDecomposition> bisim3(*dtmc, options); + ASSERT_NO_THROW(bisim3.computeBisimulationDecomposition()); + ASSERT_NO_THROW(result = bisim3.getQuotient()); + + EXPECT_EQ(storm::models::ModelType::Dtmc, result->getType()); + EXPECT_EQ(43ul, result->getNumberOfStates()); + EXPECT_EQ(83ul, result->getNumberOfTransitions()); + auto labelFormula = std::make_shared("observe0Greater1"); auto eventuallyFormula = std::make_shared(labelFormula);