Browse Source

builderoptions no longer implicitly takes settings from buildersettings

main
Sebastian Junges 5 years ago
parent
commit
a7b6e00e88
  1. 5
      src/storm-cli-utilities/model-handling.h
  2. 4
      src/storm/builder/BuilderOptions.cpp

5
src/storm-cli-utilities/model-handling.h

@ -442,6 +442,11 @@ namespace storm {
options.setApplyMaximalProgressAssumption(false); options.setApplyMaximalProgressAssumption(false);
} }
if (buildSettings.isExplorationChecksSet()) {
options.setExplorationChecks();
}
options.setReservedBitsForUnboundedVariables(options.getReservedBitsForUnboundedVariables());
options.setAddOutOfBoundsState(buildSettings.isBuildOutOfBoundsStateSet()); options.setAddOutOfBoundsState(buildSettings.isBuildOutOfBoundsStateSet());
if (buildSettings.isBuildFullModelSet()) { if (buildSettings.isBuildFullModelSet()) {
options.clearTerminalStates(); options.clearTerminalStates();

4
src/storm/builder/BuilderOptions.cpp

@ -6,7 +6,6 @@
#include "storm/logic/LiftableTransitionRewardsVisitor.h" #include "storm/logic/LiftableTransitionRewardsVisitor.h"
#include "storm/settings/SettingsManager.h" #include "storm/settings/SettingsManager.h"
#include "storm/settings/modules/BuildSettings.h"
#include "storm/settings/modules/GeneralSettings.h" #include "storm/settings/modules/GeneralSettings.h"
#include "storm/utility/macros.h" #include "storm/utility/macros.h"
@ -58,13 +57,10 @@ namespace storm {
} }
} }
auto const& buildSettings = storm::settings::getModule<storm::settings::modules::BuildSettings>();
auto const& generalSettings = storm::settings::getModule<storm::settings::modules::GeneralSettings>(); auto const& generalSettings = storm::settings::getModule<storm::settings::modules::GeneralSettings>();
if (modelDescription.hasModel()) { if (modelDescription.hasModel()) {
this->setApplyMaximalProgressAssumption(modelDescription.getModelType() == storm::storage::SymbolicModelDescription::ModelType::MA); this->setApplyMaximalProgressAssumption(modelDescription.getModelType() == storm::storage::SymbolicModelDescription::ModelType::MA);
} }
explorationChecks = buildSettings.isExplorationChecksSet();
reservedBitsForUnboundedVariables = buildSettings.getBitsForUnboundedVariables();
showProgress = generalSettings.isVerboseSet(); showProgress = generalSettings.isVerboseSet();
showProgressDelay = generalSettings.getShowProgressDelay(); showProgressDelay = generalSettings.getShowProgressDelay();
} }

|||||||
100:0
Loading…
Cancel
Save