From 37a86d81906bcc18c690c6036412249ee99d8e3f Mon Sep 17 00:00:00 2001
From: Mavo <matthias.volk@rwth-aachen.de>
Date: Tue, 1 Mar 2016 13:22:14 +0100
Subject: [PATCH 1/2] Compile fixes for gcc

Former-commit-id: cb1b187ef84f512ff5583d7c3d276cac9157ed05
---
 src/settings/Option.cpp          | 3 ++-
 src/storage/BitVectorHashMap.cpp | 1 +
 src/storage/dd/Bdd.cpp           | 4 +++-
 src/utility/macros.h             | 3 ++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/settings/Option.cpp b/src/settings/Option.cpp
index b5cba7759..cba074b58 100644
--- a/src/settings/Option.cpp
+++ b/src/settings/Option.cpp
@@ -2,6 +2,7 @@
 
 #include <iomanip>
 #include <string>
+#include <algorithm>
 #include "ArgumentBase.h"
 #include "Argument.h"
 
@@ -211,4 +212,4 @@ namespace storm {
             return out;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/storage/BitVectorHashMap.cpp b/src/storage/BitVectorHashMap.cpp
index 07eefee1d..760ffe039 100644
--- a/src/storage/BitVectorHashMap.cpp
+++ b/src/storage/BitVectorHashMap.cpp
@@ -1,6 +1,7 @@
 #include "src/storage/BitVectorHashMap.h"
 
 #include <iostream>
+#include <algorithm>
 
 #include "src/utility/macros.h"
 
diff --git a/src/storage/dd/Bdd.cpp b/src/storage/dd/Bdd.cpp
index 8f176048e..f8bf6b368 100644
--- a/src/storage/dd/Bdd.cpp
+++ b/src/storage/dd/Bdd.cpp
@@ -1,3 +1,5 @@
+#include <algorithm>
+
 #include "src/storage/dd/Bdd.h"
 #include "src/storage/dd/Add.h"
 #include "src/storage/dd/Odd.h"
@@ -360,4 +362,4 @@ namespace storm {
         template Add<DdType::Sylvan, double> Bdd<DdType::Sylvan>::ite(Add<DdType::Sylvan, double> const& thenAdd, Add<DdType::Sylvan, double> const& elseAdd) const;
         template Add<DdType::Sylvan, uint_fast64_t> Bdd<DdType::Sylvan>::ite(Add<DdType::Sylvan, uint_fast64_t> const& thenAdd, Add<DdType::Sylvan, uint_fast64_t> const& elseAdd) const;
     }
-}
\ No newline at end of file
+}
diff --git a/src/utility/macros.h b/src/utility/macros.h
index 4f70b1691..16dd4d70e 100644
--- a/src/utility/macros.h
+++ b/src/utility/macros.h
@@ -2,6 +2,7 @@
 #define STORM_UTILITY_MACROS_H_
 
 #include <cassert>
+#include <cstring>
 #include "storm-config.h"
 
 #ifndef STORM_LOGGING_FRAMEWORK
@@ -272,4 +273,4 @@ LOG4CPLUS_INFO(logger, "Enabled trace mode, log output gets printed to console."
     STORM_PRINT(message);                       \
 }
 
-#endif /* STORM_UTILITY_MACROS_H_ */
\ No newline at end of file
+#endif /* STORM_UTILITY_MACROS_H_ */

From 4c2b1d7c22019a0ff8c9a16cfbf45e7e48336fb3 Mon Sep 17 00:00:00 2001
From: Mavo <matthias.volk@rwth-aachen.de>
Date: Tue, 1 Mar 2016 13:22:43 +0100
Subject: [PATCH 2/2] Model info for benchmarking scripts

Former-commit-id: 7a686f5f79f5951edee96fb434a84312476b1a2a
---
 src/storm-dyftee.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/storm-dyftee.cpp b/src/storm-dyftee.cpp
index e167633bd..c1bafd78a 100644
--- a/src/storm-dyftee.cpp
+++ b/src/storm-dyftee.cpp
@@ -46,7 +46,8 @@ void analyzeDFT(std::string filename, std::string property, bool symred = false)
 
     
     model->printModelInformationToStream(std::cout);
-    
+    std::cout << "No. states (Explored): " << model->getNumberOfStates() << std::endl;
+    std::cout << "No. transitions (Explored): " << model->getNumberOfTransitions() << std::endl;
     std::cout << "Bisimulation..." << std::endl;
     
     if (model->getNumberOfStates() > 500 && model->isOfType(storm::models::ModelType::Ctmc)) {
@@ -54,6 +55,8 @@ void analyzeDFT(std::string filename, std::string property, bool symred = false)
     }
     
     model->printModelInformationToStream(std::cout);
+    std::cout << "No. states (Bisimulation): " << model->getNumberOfStates() << std::endl;
+    std::cout << "No. transitions (Bisimulation): " << model->getNumberOfTransitions() << std::endl;
     
     // Model checking
     std::cout << "Model checking..." << std::endl;