From 3714fc3bf2a40d740ca8cb9f7ec86ff576ead757 Mon Sep 17 00:00:00 2001 From: Tim Quatmann Date: Mon, 29 Apr 2019 11:44:31 +0200 Subject: [PATCH 1/2] MinMaxSolverEnvironment: Removed unused method declarations. --- src/storm/environment/solver/MinMaxSolverEnvironment.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/storm/environment/solver/MinMaxSolverEnvironment.h b/src/storm/environment/solver/MinMaxSolverEnvironment.h index 3f54f0fa9..b0a19d8c4 100644 --- a/src/storm/environment/solver/MinMaxSolverEnvironment.h +++ b/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; }; } From 3836fd42c00c95c5b37641f90e952f34852b52c6 Mon Sep 17 00:00:00 2001 From: Tim Quatmann Date: Mon, 29 Apr 2019 11:44:51 +0200 Subject: [PATCH 2/2] utility/vector: Added hasZeroEntry and hasInfinityEntry --- src/storm/utility/vector.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/storm/utility/vector.h b/src/storm/utility/vector.h index 53e89cacc..153f74a36 100644 --- a/src/storm/utility/vector.h +++ b/src/storm/utility/vector.h @@ -1155,6 +1155,16 @@ namespace storm { bool hasNonZeroEntry(std::vector const& v){ return std::any_of(v.begin(), v.end(), [](T value){return !storm::utility::isZero(value);}); } + + template + bool hasZeroEntry(std::vector const& v){ + return std::any_of(v.begin(), v.end(), [](T value){return storm::utility::isZero(value);}); + } + + template + bool hasInfinityEntry(std::vector const& v){ + return std::any_of(v.begin(), v.end(), [](T value){return storm::utility::isInfinity(value);}); + } inline std::set getVariables(std::vector const& vector) { std::set result;