Merge branch 'master' of https://sselab.de/lab9/private/git/storm

Former-commit-id: 461b107a6b

src/modelchecker/csl/SparseCtmcCslModelChecker.cpp

@@ -3,6 +3,8 @@
 #include "src/modelchecker/csl/helper/SparseCtmcCslHelper.h"
 #include "src/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h"
 
+#include "src/models/sparse/StandardRewardModel.h"
+
 #include "src/utility/macros.h"
 #include "src/utility/vector.h"
 #include "src/utility/graph.h"
@@ -15,7 +17,6 @@
 #include "src/exceptions/InvalidPropertyException.h"
 #include "src/exceptions/NotImplementedException.h"
 
-
 namespace storm {
     namespace modelchecker {
         template <typename SparseCtmcModelType>

src/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.cpp

@@ -2,6 +2,8 @@
 
 #include "src/modelchecker/csl/helper/SparseMarkovAutomatonCslHelper.h"
 
+#include "src/models/sparse/StandardRewardModel.h"
+
 #include "src/utility/macros.h"
 
 #include "src/settings/SettingsManager.h"

src/modelchecker/prctl/SparseDtmcPrctlModelChecker.cpp

@@ -11,6 +11,8 @@
 #include "src/modelchecker/prctl/helper/SparseDtmcPrctlHelper.h"
 #include "src/modelchecker/csl/helper/SparseCtmcCslHelper.h"
 
+#include "src/models/sparse/StandardRewardModel.h"
+
 #include "src/settings/modules/GeneralSettings.h"
 
 #include "src/exceptions/InvalidStateException.h"

src/modelchecker/prctl/SparseMdpPrctlModelChecker.cpp

@@ -8,11 +8,12 @@
 #include "src/modelchecker/results/ExplicitQualitativeCheckResult.h"
 #include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h"
 
+#include "src/models/sparse/StandardRewardModel.h"
+
 #include "src/modelchecker/prctl/helper/SparseMdpPrctlHelper.h"
 
 #include "src/solver/LpSolver.h"
 
-
 #include "src/settings/modules/GeneralSettings.h"
 
 #include "src/exceptions/InvalidStateException.h"
@@ -21,7 +22,6 @@
 
 #include "src/storage/MaximalEndComponentDecomposition.h"
 
-
 #include "src/exceptions/InvalidArgumentException.h"
 
 namespace storm {

src/solver/MinMaxLinearEquationSolver.h

@@ -3,6 +3,7 @@
 
 #include <vector>
 #include <cstdint>
+#include <memory>
 #include "SolverSelectionOptions.h"
 #include "src/storage/sparse/StateType.h"
 #include "AllowEarlyTerminationCondition.h"
@@ -41,6 +42,7 @@ namespace storm {
             /// The direction in which to optimize, can be unset.
             OptimizationDirectionSetting direction;
 
+            
             /// The required precision for the iterative methods.
             double precision;
             
@@ -70,7 +72,7 @@ namespace storm {
         protected:
             MinMaxLinearEquationSolver(storm::storage::SparseMatrix<ValueType> const& matrix, double precision, bool relativeError, uint_fast64_t maxNrIterations, bool trackPolicy, MinMaxTechniqueSelection prefTech) :
                 AbstractMinMaxLinearEquationSolver(precision, relativeError, maxNrIterations, trackPolicy, prefTech),
-                A(matrix), earlyTermination(new NoEarlyTerminationCondition<ValueType>()) {
+                earlyTermination(new NoEarlyTerminationCondition<ValueType>()), A(matrix) {
                 // Intentionally left empty.
             }
         

src/solver/SolveGoal.h

@@ -57,6 +57,7 @@ namespace storm {
             VT threshold;
             storm::storage::BitVector relevantColumnVector;
         };
+        
         template<typename VT>
         std::unique_ptr<storm::solver::MinMaxLinearEquationSolver<VT>> configureMinMaxLinearEquationSolver(BoundedGoal<VT> const& goal, storm::utility::solver::MinMaxLinearEquationSolverFactory<VT> const& factory, storm::storage::SparseMatrix<VT> const&  matrix);
         template<typename VT> 

src/storage/SparseMatrix.cpp

@@ -1165,8 +1165,6 @@ namespace storm {
         template class SparseMatrix<double>;
         template std::ostream& operator<<(std::ostream& out, SparseMatrix<double> const& matrix);
         template std::vector<double> SparseMatrix<double>::getPointwiseProductRowSumVector(storm::storage::SparseMatrix<double> const& otherMatrix) const;
-        template std::vector<storm::RationalFunction> SparseMatrix<double>::getPointwiseProductRowSumVector(storm::storage::SparseMatrix<storm::RationalFunction> const& otherMatrix) const;
-        template std::vector<storm::Interval> SparseMatrix<double>::getPointwiseProductRowSumVector(storm::storage::SparseMatrix<storm::Interval> const& otherMatrix) const;
         
         // float
         template class MatrixEntry<typename SparseMatrix<float>::index_type, float>;
@@ -1175,7 +1173,6 @@ namespace storm {
         template class SparseMatrix<float>;
         template std::ostream& operator<<(std::ostream& out, SparseMatrix<float> const& matrix);
         template std::vector<float> SparseMatrix<float>::getPointwiseProductRowSumVector(storm::storage::SparseMatrix<float> const& otherMatrix) const;
-        template std::vector<storm::RationalFunction> SparseMatrix<float>::getPointwiseProductRowSumVector(storm::storage::SparseMatrix<storm::RationalFunction> const& otherMatrix) const;
 
         // int
         template class MatrixEntry<typename SparseMatrix<int>::index_type, int>;
@@ -1183,7 +1180,6 @@ namespace storm {
         template class SparseMatrixBuilder<int>;
         template class SparseMatrix<int>;
         template std::ostream& operator<<(std::ostream& out, SparseMatrix<int> const& matrix);
-        template std::vector<storm::RationalFunction> SparseMatrix<int>::getPointwiseProductRowSumVector(storm::storage::SparseMatrix<storm::RationalFunction> const& otherMatrix) const;
 
 #ifdef STORM_HAVE_CARL
         // Rat Function
@@ -1193,8 +1189,12 @@ namespace storm {
         template class SparseMatrix<RationalFunction>;
         template std::ostream& operator<<(std::ostream& out, SparseMatrix<RationalFunction> const& matrix);
         template std::vector<storm::RationalFunction> SparseMatrix<RationalFunction>::getPointwiseProductRowSumVector(storm::storage::SparseMatrix<storm::RationalFunction> const& otherMatrix) const;
+        template std::vector<storm::RationalFunction> SparseMatrix<double>::getPointwiseProductRowSumVector(storm::storage::SparseMatrix<storm::RationalFunction> const& otherMatrix) const;
+        template std::vector<storm::RationalFunction> SparseMatrix<float>::getPointwiseProductRowSumVector(storm::storage::SparseMatrix<storm::RationalFunction> const& otherMatrix) const;
+        template std::vector<storm::RationalFunction> SparseMatrix<int>::getPointwiseProductRowSumVector(storm::storage::SparseMatrix<storm::RationalFunction> const& otherMatrix) const;
 
         // Intervals
+        template std::vector<storm::Interval> SparseMatrix<double>::getPointwiseProductRowSumVector(storm::storage::SparseMatrix<storm::Interval> const& otherMatrix) const;
         template class MatrixEntry<typename SparseMatrix<Interval>::index_type, Interval>;
         template std::ostream& operator<<(std::ostream& out, MatrixEntry<uint_fast64_t, Interval> const& entry);
         template class SparseMatrixBuilder<Interval>;

src/utility/graph.cpp

@@ -7,8 +7,10 @@
 #include "src/storage/sparse/StateType.h"
 #include "src/models/symbolic/DeterministicModel.h"
 #include "src/models/symbolic/NondeterministicModel.h"
+#include "src/models/symbolic/StandardRewardModel.h"
 #include "src/models/sparse/DeterministicModel.h"
 #include "src/models/sparse/NondeterministicModel.h"
+#include "src/models/sparse/StandardRewardModel.h"
 #include "src/utility/constants.h"
 #include "src/exceptions/InvalidArgumentException.h"
 #include "src/storage/dd/CuddBdd.h"

src/utility/macros.h

@@ -14,11 +14,12 @@ extern log4cplus::Logger logger;
 #define STORM_LOG_DEBUG(message)                \
 {                                               \
     LOG4CPLUS_DEBUG(logger, message);           \
-} while (false)
+} while (false)                                 \
+
 #define STORM_LOG_TRACE(message)                \
 {                                               \
     LOG4CPLUS_TRACE(logger, message);           \
-} while (false)
+} while (false)                                 \
 
 // Define STORM_LOG_ASSERT which is only checked when NDEBUG is not set.
 #ifndef NDEBUG
@@ -28,7 +29,8 @@ if (!(cond)) {                                  \
 LOG4CPLUS_ERROR(logger, message);               \
 assert(cond);                                   \
 }                                               \
-} while (false)
+} while (false)                                 \
+
 #else
 #define STORM_LOG_ASSERT(cond, message)         
 #endif
@@ -39,44 +41,45 @@ assert(cond);                                   \
         LOG4CPLUS_ERROR(logger, message);       \
         throw exception() << message;           \
     }                                           \
-} while (false)
+} while (false)                                 \
+
 
 // Define STORM_LOG_WARN, STORM_LOG_ERROR and STORM_LOG_INFO to log the given message with the corresponding log levels.
 #define STORM_LOG_WARN(message)                 \
 {                                               \
     LOG4CPLUS_WARN(logger, message);            \
-} while (false)
+} while (false)                                 \
 
 #define STORM_LOG_WARN_COND(cond, message)      \
 {                                               \
     if (!(cond)) {                              \
         LOG4CPLUS_WARN(logger, message);        \
     }                                           \
-} while (false)
+} while (false)                                 \
 
 #define STORM_LOG_INFO(message)                 \
 {                                               \
     LOG4CPLUS_INFO(logger, message);            \
-} while (false)
+} while (false)                                 \
 
 #define STORM_LOG_INFO_COND(cond, message)      \
 {                                               \
     if (!(cond)) {                              \
         LOG4CPLUS_INFO(logger, message);        \
     }                                           \
-} while (false)
+} while (false)                                 \
 
 #define STORM_LOG_ERROR(message)                \
 {                                               \
     LOG4CPLUS_ERROR(logger, message);           \
-} while (false)
+} while (false)                                 \
 
 #define STORM_LOG_ERROR_COND(cond, message)     \
 {                                               \
     if (!(cond)) {                              \
         LOG4CPLUS_ERROR(logger, message);       \
     }                                           \
-} while (false)
+} while (false)                                 \
 
 /*!
  * Define the macros that print information and optionally also log it.

src/utility/solver.h

@@ -3,6 +3,7 @@
 
 #include <set>
 #include <vector>
+#include <memory>
 
 #include "src/storage/dd/DdType.h"
 #include "src/solver/SolverSelectionOptions.h"

test/performance/storage/MaximalEndComponentDecompositionTest.cpp

@@ -3,6 +3,7 @@
 #include "src/parser/AutoParser.h"
 #include "src/storage/MaximalEndComponentDecomposition.h"
 #include "src/models/sparse/Mdp.h"
+#include "src/models/sparse/StandardRewardModel.h"
 
 TEST(MaximalEndComponentDecomposition, AsynchronousLeader) {
 	std::shared_ptr<storm::models::sparse::Model<double>> abstractModel = storm::parser::AutoParser::parseModel(STORM_CPP_BASE_PATH "/examples/mdp/asynchronous_leader/leader7.tra", STORM_CPP_BASE_PATH "/examples/mdp/asynchronous_leader/leader7.lab", "", "");

test/performance/storage/StronglyConnectedComponentDecompositionTest.cpp

@@ -4,6 +4,7 @@
 #include "src/storage/StronglyConnectedComponentDecomposition.h"
 #include "src/models/sparse/Mdp.h"
 #include "src/models/sparse/Dtmc.h"
+#include "src/models/sparse/StandardRewardModel.h"
 
 TEST(StronglyConnectedComponentDecomposition, Crowds) {
 	std::shared_ptr<storm::models::sparse::Model<double>> abstractModel = storm::parser::AutoParser::parseModel(STORM_CPP_BASE_PATH "/examples/dtmc/crowds/crowds20_5.tra", STORM_CPP_BASE_PATH "/examples/dtmc/crowds/crowds20_5.lab", "", "");