From 172c5f3657ecdda8045a11a104dc4951f02a5678 Mon Sep 17 00:00:00 2001 From: TimQu Date: Wed, 21 Mar 2018 11:42:12 +0100 Subject: [PATCH] Making things compile again... --- src/storm/solver/LpMinMaxLinearEquationSolver.cpp | 4 +--- src/storm/solver/SymbolicMinMaxLinearEquationSolver.cpp | 4 ---- src/test/storm/solver/LinearEquationSolverTest.cpp | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/storm/solver/LpMinMaxLinearEquationSolver.cpp b/src/storm/solver/LpMinMaxLinearEquationSolver.cpp index 5143fcdef..78bc75752 100644 --- a/src/storm/solver/LpMinMaxLinearEquationSolver.cpp +++ b/src/storm/solver/LpMinMaxLinearEquationSolver.cpp @@ -120,9 +120,7 @@ namespace storm { requirements.requireNoEndComponents(); } - if (env.solver().minMax().isForceBoundsSet()) { - requirements.requireBounds(); - } + requirements.requireBounds(false); return requirements; } diff --git a/src/storm/solver/SymbolicMinMaxLinearEquationSolver.cpp b/src/storm/solver/SymbolicMinMaxLinearEquationSolver.cpp index b9f8551c3..b599face7 100644 --- a/src/storm/solver/SymbolicMinMaxLinearEquationSolver.cpp +++ b/src/storm/solver/SymbolicMinMaxLinearEquationSolver.cpp @@ -458,10 +458,6 @@ namespace storm { STORM_LOG_THROW(false, storm::exceptions::InvalidEnvironmentException, "The selected min max technique is not supported by this solver."); } - if (env.solver().minMax().isForceBoundsSet()) { - requirements.requireBounds(); - } - return requirements; } diff --git a/src/test/storm/solver/LinearEquationSolverTest.cpp b/src/test/storm/solver/LinearEquationSolverTest.cpp index f96f88e5d..114452ba8 100644 --- a/src/test/storm/solver/LinearEquationSolverTest.cpp +++ b/src/test/storm/solver/LinearEquationSolverTest.cpp @@ -345,7 +345,7 @@ namespace { auto requirements = factory.getRequirements(this->env()); requirements.clearUpperBounds(); requirements.clearLowerBounds(); - ASSERT_TRUE(requirements.empty()); + ASSERT_FALSE(requirements.hasEnabledRequirement()); auto solver = factory.create(this->env(), A); solver->setBounds(this->parseNumber("-100"), this->parseNumber("100")); ASSERT_NO_THROW(solver->solveEquations(this->env(), x, b));