From a47fcbb6f955c2a0c7cefec13c6681c0517100d3 Mon Sep 17 00:00:00 2001 From: TimQu Date: Thu, 16 Nov 2017 15:17:58 +0100 Subject: [PATCH] making test-solver compile again --- .../solver/MinMaxLinearEquationSolverTest.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/storm/solver/MinMaxLinearEquationSolverTest.cpp b/src/test/storm/solver/MinMaxLinearEquationSolverTest.cpp index 9a6048bf3..14874bcef 100644 --- a/src/test/storm/solver/MinMaxLinearEquationSolverTest.cpp +++ b/src/test/storm/solver/MinMaxLinearEquationSolverTest.cpp @@ -120,10 +120,10 @@ namespace { req.clearBounds(); ASSERT_TRUE(req.empty()); ASSERT_NO_THROW(solver->solveEquations(this->env(), storm::OptimizationDirection::Minimize, x, b)); - STORM_EXPECT_NEAR(x[0], this->parseNumber("0.5"), this->precision()); + EXPECT_NEAR(x[0], this->parseNumber("0.5"), this->precision()); ASSERT_NO_THROW(solver->solveEquations(this->env(), storm::OptimizationDirection::Maximize, x, b)); - STORM_EXPECT_NEAR(x[0], this->parseNumber("0.99"), this->precision()); + EXPECT_NEAR(x[0], this->parseNumber("0.99"), this->precision()); } TYPED_TEST(MinMaxLinearEquationSolverTest, MatrixVectorMultiplication) { @@ -152,23 +152,23 @@ namespace { x = initialX; ASSERT_NO_THROW(solver->repeatedMultiply(storm::OptimizationDirection::Minimize, x, nullptr, 1)); - STORM_EXPECT_NEAR(x[0], this->parseNumber("0.099"), this->precision()); + EXPECT_NEAR(x[0], this->parseNumber("0.099"), this->precision()); x = initialX; ASSERT_NO_THROW(solver->repeatedMultiply(storm::OptimizationDirection::Minimize, x, nullptr, 2)); - STORM_EXPECT_NEAR(x[0], this->parseNumber("0.1881"), this->precision()); + EXPECT_NEAR(x[0], this->parseNumber("0.1881"), this->precision()); x = initialX; ASSERT_NO_THROW(solver->repeatedMultiply(storm::OptimizationDirection::Minimize, x, nullptr, 20)); - STORM_EXPECT_NEAR(x[0], this->parseNumber("0.5"), this->precision()); + EXPECT_NEAR(x[0], this->parseNumber("0.5"), this->precision()); x = initialX; ASSERT_NO_THROW(solver->repeatedMultiply(storm::OptimizationDirection::Maximize, x, nullptr, 1)); - STORM_EXPECT_NEAR(x[0], this->parseNumber("0.5"), this->precision()); + EXPECT_NEAR(x[0], this->parseNumber("0.5"), this->precision()); x = initialX; ASSERT_NO_THROW(solver->repeatedMultiply(storm::OptimizationDirection::Maximize, x, nullptr, 20)); - STORM_EXPECT_NEAR(x[0], this->parseNumber("0.9238082658"), this->precision()); + EXPECT_NEAR(x[0], this->parseNumber("0.923808265834023387639"), this->precision()); } }