Merge branch 'master' into deterministicScheds

src/storm/environment/solver/MinMaxSolverEnvironment.h

@@ -25,8 +25,6 @@ namespace storm {
         void setRelativeTerminationCriterion(bool value);
         storm::solver::MultiplicationStyle const& getMultiplicationStyle() const;
         void setMultiplicationStyle(storm::solver::MultiplicationStyle value);
-        bool isForceBoundsSet() const;
-        void setForceBounds(bool value);
         bool isSymmetricUpdatesSet() const;
         void setSymmetricUpdates(bool value);
         
@@ -37,7 +35,6 @@ namespace storm {
         storm::RationalNumber precision;
         bool considerRelativeTerminationCriterion;
         storm::solver::MultiplicationStyle multiplicationStyle;
-        bool forceBounds;
         bool symmetricUpdates;
     };
 }

src/storm/utility/vector.h

@@ -1160,6 +1160,11 @@ namespace storm {
             bool hasZeroEntry(std::vector<T> const& v){
                 return std::any_of(v.begin(), v.end(), [](T value){return storm::utility::isZero(value);});
             }
+            
+            template<typename T>
+            bool hasInfinityEntry(std::vector<T> const& v){
+                return std::any_of(v.begin(), v.end(), [](T value){return storm::utility::isInfinity(value);});
+            }
 
             inline std::set<storm::RationalFunctionVariable> getVariables(std::vector<storm::RationalFunction> const& vector) {
                 std::set<storm::RationalFunctionVariable> result;