From 19f6552b05ad5b7a7363ee92cb1e18d0ddf46eee Mon Sep 17 00:00:00 2001 From: Tim Quatmann Date: Tue, 11 Aug 2020 16:56:48 +0200 Subject: [PATCH] Fixed insufficient precision in CTMC LRA test --- .../storm/modelchecker/csl/LraCtmcCslModelCheckerTest.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/test/storm/modelchecker/csl/LraCtmcCslModelCheckerTest.cpp b/src/test/storm/modelchecker/csl/LraCtmcCslModelCheckerTest.cpp index b20bf7f6b..75e41cdf2 100755 --- a/src/test/storm/modelchecker/csl/LraCtmcCslModelCheckerTest.cpp +++ b/src/test/storm/modelchecker/csl/LraCtmcCslModelCheckerTest.cpp @@ -43,6 +43,7 @@ namespace { env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Gmmxx); env.solver().gmmxx().setMethod(storm::solver::GmmxxLinearEquationSolverMethod::Gmres); env.solver().gmmxx().setPreconditioner(storm::solver::GmmxxLinearEquationSolverPreconditioner::Ilu); + env.solver().gmmxx().setPrecision(storm::utility::convertNumber(1e-8)); // Need to increase precision because eq sys yields incorrect results env.solver().lra().setDetLraMethod(storm::solver::LraMethod::GainBiasEquations); env.solver().lra().setPrecision(storm::utility::convertNumber(1e-8)); // Need to increase precision because eq sys yields incorrect results return env; @@ -61,6 +62,7 @@ namespace { env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Gmmxx); env.solver().gmmxx().setMethod(storm::solver::GmmxxLinearEquationSolverMethod::Gmres); env.solver().gmmxx().setPreconditioner(storm::solver::GmmxxLinearEquationSolverPreconditioner::Ilu); + env.solver().gmmxx().setPrecision(storm::utility::convertNumber(1e-8)); // Need to increase precision because eq sys yields incorrect results env.solver().lra().setDetLraMethod(storm::solver::LraMethod::GainBiasEquations); env.solver().lra().setPrecision(storm::utility::convertNumber(1e-8)); // Need to increase precision because eq sys yields incorrect results return env; @@ -78,6 +80,8 @@ namespace { storm::Environment env; env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Gmmxx); env.solver().gmmxx().setMethod(storm::solver::GmmxxLinearEquationSolverMethod::Gmres); + env.solver().gmmxx().setPreconditioner(storm::solver::GmmxxLinearEquationSolverPreconditioner::Ilu); + env.solver().gmmxx().setPrecision(storm::utility::convertNumber(1e-8)); // Need to increase precision because eq sys yields incorrect results env.solver().lra().setDetLraMethod(storm::solver::LraMethod::GainBiasEquations); env.solver().lra().setPrecision(storm::utility::convertNumber(1e-8)); // Need to increase precision because eq sys yields incorrect results return env; @@ -95,6 +99,8 @@ namespace { storm::Environment env; env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Gmmxx); env.solver().gmmxx().setMethod(storm::solver::GmmxxLinearEquationSolverMethod::Gmres); + env.solver().gmmxx().setPreconditioner(storm::solver::GmmxxLinearEquationSolverPreconditioner::Ilu); + env.solver().gmmxx().setPrecision(storm::utility::convertNumber(1e-8)); // Need to increase precision because eq sys yields incorrect results env.solver().lra().setDetLraMethod(storm::solver::LraMethod::GainBiasEquations); env.solver().lra().setPrecision(storm::utility::convertNumber(1e-8)); // Need to increase precision because eq sys yields incorrect results return env; @@ -164,6 +170,7 @@ namespace { env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Gmmxx); env.solver().gmmxx().setMethod(storm::solver::GmmxxLinearEquationSolverMethod::Gmres); env.solver().gmmxx().setPreconditioner(storm::solver::GmmxxLinearEquationSolverPreconditioner::Ilu); + env.solver().gmmxx().setPrecision(storm::utility::convertNumber(1e-8)); // Need to increase precision because eq sys yields incorrect results env.solver().lra().setDetLraMethod(storm::solver::LraMethod::LraDistributionEquations); env.solver().lra().setPrecision(storm::utility::convertNumber(1e-8)); // Need to increase precision because eq sys yields incorrect results return env;