From 2aa8d111012bc81fd845039eef5dc0d9b5977cdb Mon Sep 17 00:00:00 2001 From: dehnert Date: Wed, 25 Sep 2013 12:20:27 +0200 Subject: [PATCH] Removed unnecessary option. Fixed performance tests. Former-commit-id: 183c5469533da8bc7e47a51a51fc16734366c026 --- src/storm.cpp | 2 +- src/utility/StormOptions.cpp | 1 - .../modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/storm.cpp b/src/storm.cpp index 24e82f039..da0bde007 100644 --- a/src/storm.cpp +++ b/src/storm.cpp @@ -336,7 +336,7 @@ int main(const int argc, const char* argv[]) { std::shared_ptr> model = adapter.getModel(constants); model->printModelInformationToStream(std::cout); -// Enable the following lines to test the MinimalLabelSetGenerator. + // Enable the following lines to test the MinimalLabelSetGenerator. // if (model->getType() == storm::models::MDP) { // std::shared_ptr> labeledMdp = model->as>(); // storm::storage::BitVector const& finishedStates = labeledMdp->getLabeledStates("finished"); diff --git a/src/utility/StormOptions.cpp b/src/utility/StormOptions.cpp index 5b00e138d..e35d09b05 100644 --- a/src/utility/StormOptions.cpp +++ b/src/utility/StormOptions.cpp @@ -19,7 +19,6 @@ bool storm::utility::StormOptions::optionsRegistered = storm::settings::Settings matrixLibrarys.push_back("gmm++"); matrixLibrarys.push_back("native"); settings->addOption(storm::settings::OptionBuilder("StoRM Main", "matrixLibrary", "m", "Which matrix library is to be used in numerical solving").addArgument(storm::settings::ArgumentBuilder::createStringArgument("matrixLibraryName", "Name of a buildin Library").addValidationFunctionString(storm::settings::ArgumentValidators::stringInListValidator(matrixLibrarys)).setDefaultValueString("gmm++").build()).build()); - settings->addOption(storm::settings::OptionBuilder("StoRM Main", "useHeuristicPresolve", "", "Sets whether heuristic methods should be applied to get better initial values for value iteration").build()); return true; }); \ No newline at end of file diff --git a/test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp b/test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp index d41221bf5..6cb6fbb50 100644 --- a/test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp +++ b/test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp @@ -31,7 +31,7 @@ TEST(GmmxxDtmcPrctlModelCheckerTest, Crowds) { ASSERT_NE(nullptr, result); - ASSERT_LT(std::abs((*result)[0] - 0.2296803699), s->getOptionByLongName("precision").getArgument(0).getValueAsDouble()); + ASSERT_LT(std::abs((*result)[0] - 0.2296800237), s->getOptionByLongName("precision").getArgument(0).getValueAsDouble()); delete probFormula; delete result; @@ -46,7 +46,7 @@ TEST(GmmxxDtmcPrctlModelCheckerTest, Crowds) { ASSERT_NE(nullptr, result); - ASSERT_LT(std::abs((*result)[0] - 0.05072232915), s->getOptionByLongName("precision").getArgument(0).getValueAsDouble()); + ASSERT_LT(std::abs((*result)[0] - 0.05073232193), s->getOptionByLongName("precision").getArgument(0).getValueAsDouble()); delete probFormula; delete result; @@ -61,7 +61,7 @@ TEST(GmmxxDtmcPrctlModelCheckerTest, Crowds) { ASSERT_NE(nullptr, result); - ASSERT_LT(std::abs((*result)[0] - 0.2274230551), s->getOptionByLongName("precision").getArgument(0).getValueAsDouble()); + ASSERT_LT(std::abs((*result)[0] - 0.22742171078), s->getOptionByLongName("precision").getArgument(0).getValueAsDouble()); delete probFormula; delete result; @@ -108,7 +108,7 @@ TEST(GmmxxDtmcPrctlModelCheckerTest, SynchronousLeader) { ASSERT_NE(nullptr, result); - ASSERT_LT(std::abs((*result)[0] - 0.999394979327824395376467), s->getOptionByLongName("precision").getArgument(0).getValueAsDouble()); + ASSERT_LT(std::abs((*result)[0] - 0.9993949793), s->getOptionByLongName("precision").getArgument(0).getValueAsDouble()); delete probFormula; delete result; @@ -123,7 +123,7 @@ TEST(GmmxxDtmcPrctlModelCheckerTest, SynchronousLeader) { ASSERT_NE(nullptr, result); - ASSERT_LT(std::abs((*result)[0] - 1.02521744572240791626427), s->getOptionByLongName("precision").getArgument(0).getValueAsDouble()); + ASSERT_LT(std::abs((*result)[0] - 1.025106273), s->getOptionByLongName("precision").getArgument(0).getValueAsDouble()); delete rewardFormula; delete result;