Browse Source

builderoptions no longer implicitly takes settings from buildersettings

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

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

@ -441,7 +441,12 @@ namespace storm {
if (buildSettings.isApplyNoMaximumProgressAssumptionSet()) {
options.setApplyMaximalProgressAssumption(false);
}
if (buildSettings.isExplorationChecksSet()) {
options.setExplorationChecks();
}
options.setReservedBitsForUnboundedVariables(options.getReservedBitsForUnboundedVariables());
options.setAddOutOfBoundsState(buildSettings.isBuildOutOfBoundsStateSet());
if (buildSettings.isBuildFullModelSet()) {
options.clearTerminalStates();

4
src/storm/builder/BuilderOptions.cpp

@ -6,7 +6,6 @@
#include "storm/logic/LiftableTransitionRewardsVisitor.h"
#include "storm/settings/SettingsManager.h"
#include "storm/settings/modules/BuildSettings.h"
#include "storm/settings/modules/GeneralSettings.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>();
if (modelDescription.hasModel()) {
this->setApplyMaximalProgressAssumption(modelDescription.getModelType() == storm::storage::SymbolicModelDescription::ModelType::MA);
}
explorationChecks = buildSettings.isExplorationChecksSet();
reservedBitsForUnboundedVariables = buildSettings.getBitsForUnboundedVariables();
showProgress = generalSettings.isVerboseSet();
showProgressDelay = generalSettings.getShowProgressDelay();
}

Loading…
Cancel
Save