From 50e7bbfe35bd508b9cbcae70c8a4d6549bfb7d52 Mon Sep 17 00:00:00 2001
From: dehnert <dehnert@cs.rwth-aachen.de>
Date: Thu, 3 Dec 2015 19:10:21 +0100
Subject: [PATCH] fixed a tests, all tests running again

Former-commit-id: b271ae5e84b3afe91a7254c370efbaa63ce2d1da
---
 test/functional/utility/GraphTest.cpp | 74 +++++++++++++++------------
 1 file changed, 42 insertions(+), 32 deletions(-)

diff --git a/test/functional/utility/GraphTest.cpp b/test/functional/utility/GraphTest.cpp
index c99925afc..726dc2dc2 100644
--- a/test/functional/utility/GraphTest.cpp
+++ b/test/functional/utility/GraphTest.cpp
@@ -124,50 +124,60 @@ TEST(GraphTest, SymbolicProb01MinMax_Sylvan) {
     std::shared_ptr<storm::models::symbolic::Model<storm::dd::DdType::Sylvan>> model = storm::builder::DdPrismModelBuilder<storm::dd::DdType::Sylvan>::translateProgram(program);
     
     ASSERT_TRUE(model->getType() == storm::models::ModelType::Mdp);
-    
-    std::pair<storm::dd::Bdd<storm::dd::DdType::Sylvan>, storm::dd::Bdd<storm::dd::DdType::Sylvan>> statesWithProbability01;
-    
-    ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Min(*model->as<storm::models::symbolic::Mdp<storm::dd::DdType::Sylvan>>(), model->getReachableStates(), model->getStates("elected")));
-    EXPECT_EQ(0ul, statesWithProbability01.first.getNonZeroCount());
-    EXPECT_EQ(364ul, statesWithProbability01.second.getNonZeroCount());
-    
-    ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Max(*model->as<storm::models::symbolic::Mdp<storm::dd::DdType::Sylvan>>(), model->getReachableStates(), model->getStates("elected")));
-    EXPECT_EQ(0ul, statesWithProbability01.first.getNonZeroCount());
-    EXPECT_EQ(364ul, statesWithProbability01.second.getNonZeroCount());
+
+    {
+        std::pair<storm::dd::Bdd<storm::dd::DdType::Sylvan>, storm::dd::Bdd<storm::dd::DdType::Sylvan>> statesWithProbability01;
+        
+        ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Min(*model->as<storm::models::symbolic::Mdp<storm::dd::DdType::Sylvan>>(), model->getReachableStates(), model->getStates("elected")));
+        EXPECT_EQ(0ul, statesWithProbability01.first.getNonZeroCount());
+        EXPECT_EQ(364ul, statesWithProbability01.second.getNonZeroCount());
+        
+        ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Max(*model->as<storm::models::symbolic::Mdp<storm::dd::DdType::Sylvan>>(), model->getReachableStates(), model->getStates("elected")));
+        EXPECT_EQ(0ul, statesWithProbability01.first.getNonZeroCount());
+        EXPECT_EQ(364ul, statesWithProbability01.second.getNonZeroCount());
+    }
     
     program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/coin2-2.nm");
     model = storm::builder::DdPrismModelBuilder<storm::dd::DdType::Sylvan>::translateProgram(program);
     
     ASSERT_TRUE(model->getType() == storm::models::ModelType::Mdp);
     
-    ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Min(*model->as<storm::models::symbolic::Mdp<storm::dd::DdType::Sylvan>>(), model->getReachableStates(), model->getStates("all_coins_equal_0")));
-    EXPECT_EQ(77ul, statesWithProbability01.first.getNonZeroCount());
-    EXPECT_EQ(149ul, statesWithProbability01.second.getNonZeroCount());
-    
-    ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Max(*model->as<storm::models::symbolic::Mdp<storm::dd::DdType::Sylvan>>(), model->getReachableStates(), model->getStates("all_coins_equal_0")));
-    EXPECT_EQ(74ul, statesWithProbability01.first.getNonZeroCount());
-    EXPECT_EQ(198ul, statesWithProbability01.second.getNonZeroCount());
-    
-    ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Min(*model->as<storm::models::symbolic::Mdp<storm::dd::DdType::Sylvan>>(), model->getReachableStates(), model->getStates("all_coins_equal_1")));
-    EXPECT_EQ(94ul, statesWithProbability01.first.getNonZeroCount());
-    EXPECT_EQ(33ul, statesWithProbability01.second.getNonZeroCount());
-    
-    ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Max(*model->as<storm::models::symbolic::Mdp<storm::dd::DdType::Sylvan>>(), model->getReachableStates(), model->getStates("all_coins_equal_1")));
-    EXPECT_EQ(83ul, statesWithProbability01.first.getNonZeroCount());
-    EXPECT_EQ(35ul, statesWithProbability01.second.getNonZeroCount());
+    {
+        std::pair<storm::dd::Bdd<storm::dd::DdType::Sylvan>, storm::dd::Bdd<storm::dd::DdType::Sylvan>> statesWithProbability01;
+
+        ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Min(*model->as<storm::models::symbolic::Mdp<storm::dd::DdType::Sylvan>>(), model->getReachableStates(), model->getStates("all_coins_equal_0")));
+        EXPECT_EQ(77ul, statesWithProbability01.first.getNonZeroCount());
+        EXPECT_EQ(149ul, statesWithProbability01.second.getNonZeroCount());
+        
+        ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Max(*model->as<storm::models::symbolic::Mdp<storm::dd::DdType::Sylvan>>(), model->getReachableStates(), model->getStates("all_coins_equal_0")));
+        EXPECT_EQ(74ul, statesWithProbability01.first.getNonZeroCount());
+        EXPECT_EQ(198ul, statesWithProbability01.second.getNonZeroCount());
+        
+        ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Min(*model->as<storm::models::symbolic::Mdp<storm::dd::DdType::Sylvan>>(), model->getReachableStates(), model->getStates("all_coins_equal_1")));
+        EXPECT_EQ(94ul, statesWithProbability01.first.getNonZeroCount());
+        EXPECT_EQ(33ul, statesWithProbability01.second.getNonZeroCount());
+        
+        ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Max(*model->as<storm::models::symbolic::Mdp<storm::dd::DdType::Sylvan>>(), model->getReachableStates(), model->getStates("all_coins_equal_1")));
+        EXPECT_EQ(83ul, statesWithProbability01.first.getNonZeroCount());
+        EXPECT_EQ(35ul, statesWithProbability01.second.getNonZeroCount());
+    }
     
     program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/csma2-2.nm");
     model = storm::builder::DdPrismModelBuilder<storm::dd::DdType::Sylvan>::translateProgram(program);
     
     ASSERT_TRUE(model->getType() == storm::models::ModelType::Mdp);
     
-    ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Min(*model->as<storm::models::symbolic::Mdp<storm::dd::DdType::Sylvan>>(), model->getReachableStates(), model->getStates("collision_max_backoff")));
-    EXPECT_EQ(993ul, statesWithProbability01.first.getNonZeroCount());
-    EXPECT_EQ(16ul, statesWithProbability01.second.getNonZeroCount());
-    
-    ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Max(*model->as<storm::models::symbolic::Mdp<storm::dd::DdType::Sylvan>>(), model->getReachableStates(), model->getStates("collision_max_backoff")));
-    EXPECT_EQ(993ul, statesWithProbability01.first.getNonZeroCount());
-    EXPECT_EQ(16ul, statesWithProbability01.second.getNonZeroCount());
+    {
+        std::pair<storm::dd::Bdd<storm::dd::DdType::Sylvan>, storm::dd::Bdd<storm::dd::DdType::Sylvan>> statesWithProbability01;
+
+        ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Min(*model->as<storm::models::symbolic::Mdp<storm::dd::DdType::Sylvan>>(), model->getReachableStates(), model->getStates("collision_max_backoff")));
+        EXPECT_EQ(993ul, statesWithProbability01.first.getNonZeroCount());
+        EXPECT_EQ(16ul, statesWithProbability01.second.getNonZeroCount());
+        
+        ASSERT_NO_THROW(statesWithProbability01 = storm::utility::graph::performProb01Max(*model->as<storm::models::symbolic::Mdp<storm::dd::DdType::Sylvan>>(), model->getReachableStates(), model->getStates("collision_max_backoff")));
+        EXPECT_EQ(993ul, statesWithProbability01.first.getNonZeroCount());
+        EXPECT_EQ(16ul, statesWithProbability01.second.getNonZeroCount());
+    }
 }
 
 TEST(GraphTest, ExplicitProb01) {