Merge

Former-commit-id: 23174a1636

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;
         }
     }
-}
+}

src/storage/BitVectorHashMap.cpp

@@ -1,6 +1,7 @@
 #include "src/storage/BitVectorHashMap.h"
 
 #include <iostream>
+#include <algorithm>
 
 #include "src/utility/macros.h"
 

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;
     }
-}
+}

src/storm-dyftee.cpp

@@ -46,6 +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;
     
     if (model->getNumberOfStates() > 500 && model->isOfType(storm::models::ModelType::Ctmc)) {
         std::cout << "Bisimulation..." << std::endl;
@@ -53,6 +55,9 @@ 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;
     std::unique_ptr<storm::modelchecker::CheckResult> result(storm::verifySparseModel(model, formulas[0]));

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_ */
+#endif /* STORM_UTILITY_MACROS_H_ */