From ab93422fa009669b9fdeb050f03650beef12f56a Mon Sep 17 00:00:00 2001 From: Tim Quatmann Date: Mon, 25 May 2020 09:40:01 +0200 Subject: [PATCH] Changed default dd library from `cudd` to `sylvan` (cf. Github issue #71) --- CHANGELOG.md | 5 +++-- src/storm/settings/modules/CoreSettings.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a20071d4..910b2a437 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,10 +8,11 @@ The releases of major and minor versions contain an overview of changes since th Version 1.5.x ------------- ## Version 1.5.x (Under development) -- Scheduler export: Properly handle models with end components. Added export in .json format. +- Changed default Dd library from `cudd` to `sylvan`. The Dd library can be changed back to `cudd` using the command line switch `--ddlib`. +- Scheduler export: Properly handle models with end components. Added export in `.json` format. - CMake: Search for Gurobi prefers new versions - CMake: We no longer ship xerces-c. If xerces-c is not found on the system, storm-gspn will not be able to parse xml-based GSPN formats -- `Eigen' library: The source code of Eigen is no longer included but downloaded from an external repository instead. Incremented Eigen version to 3.3.7 which fixes a compilation issue with recent XCode Versions. +- Eigen library: The source code of Eigen is no longer included but downloaded from an external repository instead. Incremented Eigen version to 3.3.7 which fixes a compilation issue with recent XCode versions. - Tests: Enabled tests for permissive schedulers - `storm-counterexamples`: fix when computing multiple counterexamples in debug mode - `storm-dft`: Renamed setting `--show-dft-stats` to `dft-statistics` and added approximation information to statistics. diff --git a/src/storm/settings/modules/CoreSettings.cpp b/src/storm/settings/modules/CoreSettings.cpp index 0f05c1aa6..d520f930b 100644 --- a/src/storm/settings/modules/CoreSettings.cpp +++ b/src/storm/settings/modules/CoreSettings.cpp @@ -46,7 +46,7 @@ namespace storm { std::vector ddLibraries = {"cudd", "sylvan"}; this->addOption(storm::settings::OptionBuilder(moduleName, ddLibraryOptionName, false, "Sets which library is preferred for decision-diagram operations.") - .addArgument(storm::settings::ArgumentBuilder::createStringArgument("name", "The name of the library to prefer.").addValidatorString(ArgumentValidatorFactory::createMultipleChoiceValidator(ddLibraries)).setDefaultValueString("cudd").build()).build()); + .addArgument(storm::settings::ArgumentBuilder::createStringArgument("name", "The name of the library to prefer.").addValidatorString(ArgumentValidatorFactory::createMultipleChoiceValidator(ddLibraries)).setDefaultValueString("sylvan").build()).build()); std::vector lpSolvers = {"gurobi", "glpk", "z3"}; this->addOption(storm::settings::OptionBuilder(moduleName, lpSolverOptionName, false, "Sets which LP solver is preferred.")