From 2fcd6c95fb1ccea8d5fcc1dca08a96c141a1d8f1 Mon Sep 17 00:00:00 2001 From: dehnert Date: Wed, 15 May 2013 20:00:25 +0200 Subject: [PATCH] Performance tests now run fine (and take about 3 minutes). --- .../GmmxxDtmcPrctModelCheckerTest.cpp | 4 ++-- .../GmmxxMdpPrctModelCheckerTest.cpp | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp b/test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp index 4ce527d7e..2609ba0a1 100644 --- a/test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp +++ b/test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp @@ -95,7 +95,7 @@ TEST(GmmxxDtmcPrctModelCheckerTest, SynchronousLeader) { ASSERT_NE(nullptr, result); - ASSERT_LT(std::abs((*result)[0] - 0.9999996339), s->get("precision")); + ASSERT_LT(std::abs((*result)[0] - 0.999394979327824395376467), s->get("precision")); delete probFormula; delete result; @@ -108,7 +108,7 @@ TEST(GmmxxDtmcPrctModelCheckerTest, SynchronousLeader) { ASSERT_NE(nullptr, result); - ASSERT_LT(std::abs((*result)[0] - 1.025217446), s->get("precision")); + ASSERT_LT(std::abs((*result)[0] - 1.02521744572240791626427), s->get("precision")); delete rewardFormula; delete result; diff --git a/test/performance/modelchecker/GmmxxMdpPrctModelCheckerTest.cpp b/test/performance/modelchecker/GmmxxMdpPrctModelCheckerTest.cpp index 82c43a4fc..dc9bea32b 100644 --- a/test/performance/modelchecker/GmmxxMdpPrctModelCheckerTest.cpp +++ b/test/performance/modelchecker/GmmxxMdpPrctModelCheckerTest.cpp @@ -116,7 +116,7 @@ TEST(GmmxxMdpPrctModelCheckerTest, Consensus) { ASSERT_NE(nullptr, result); - ASSERT_LT(std::abs((*result)[0] - 1), s->get("precision")); + ASSERT_LT(std::abs((*result)[31168] - 1), s->get("precision")); delete probFormula; delete result; @@ -131,7 +131,7 @@ TEST(GmmxxMdpPrctModelCheckerTest, Consensus) { ASSERT_NE(nullptr, result); - ASSERT_LT(std::abs((*result)[0] - 0.4370098592), s->get("precision")); + ASSERT_LT(std::abs((*result)[31168] - 0.4370098591707694546393), s->get("precision")); delete probFormula; delete result; @@ -146,7 +146,7 @@ TEST(GmmxxMdpPrctModelCheckerTest, Consensus) { ASSERT_NE(nullptr, result); - ASSERT_LT(std::abs((*result)[0] - 0.4370098592), s->get("precision")); + ASSERT_LT(std::abs((*result)[31168] - 0.5282872761373342829216), s->get("precision")); delete probFormula; delete result; @@ -156,13 +156,13 @@ TEST(GmmxxMdpPrctModelCheckerTest, Consensus) { storm::property::prctl::Not* notFormula = new storm::property::prctl::Not(apFormula2); andFormula = new storm::property::prctl::And(apFormula, notFormula); eventuallyFormula = new storm::property::prctl::Eventually(andFormula); - probFormula = new storm::property::prctl::ProbabilisticNoBoundOperator(eventuallyFormula, true); + probFormula = new storm::property::prctl::ProbabilisticNoBoundOperator(eventuallyFormula, false); result = mc.checkNoBoundOperator(*probFormula); ASSERT_NE(nullptr, result); - ASSERT_LT(std::abs((*result)[0] - 0.1034345104), s->get("precision")); + ASSERT_LT(std::abs((*result)[31168] - 0.10343451035775527713), s->get("precision")); delete probFormula; delete result; @@ -175,7 +175,7 @@ TEST(GmmxxMdpPrctModelCheckerTest, Consensus) { ASSERT_NE(nullptr, result); - ASSERT_LT(std::abs((*result)[0] - 0), s->get("precision")); + ASSERT_LT(std::abs((*result)[31168] - 0), s->get("precision")); delete probFormula; delete result; @@ -188,7 +188,7 @@ TEST(GmmxxMdpPrctModelCheckerTest, Consensus) { ASSERT_NE(nullptr, result); - ASSERT_LT(std::abs((*result)[0] - 0), s->get("precision")); + ASSERT_LT(std::abs((*result)[31168] - 0), s->get("precision")); delete probFormula; delete result; @@ -199,7 +199,7 @@ TEST(GmmxxMdpPrctModelCheckerTest, Consensus) { result = mc.checkNoBoundOperator(*rewardFormula); - ASSERT_LT(std::abs((*result)[0] - 1725.593313), s->get("precision")); + ASSERT_LT(std::abs((*result)[31168] - 1725.5933133943854045), s->get("precision")); delete rewardFormula; delete result; @@ -212,7 +212,7 @@ TEST(GmmxxMdpPrctModelCheckerTest, Consensus) { ASSERT_NE(nullptr, result); - ASSERT_LT(std::abs((*result)[0] - 2179.014847), s->get("precision")); + ASSERT_LT(std::abs((*result)[31168] - 2179.014847073392047605011), s->get("precision")); delete rewardFormula; delete result;