From a7b6e00e8884e2cba07a624e5fd2c0b39e9118e0 Mon Sep 17 00:00:00 2001
From: Sebastian Junges <sebastian.junges@gmail.com>
Date: Sat, 30 May 2020 18:44:50 -0700
Subject: [PATCH] builderoptions no longer implicitly takes settings from
 buildersettings

---
 src/storm-cli-utilities/model-handling.h | 7 ++++++-
 src/storm/builder/BuilderOptions.cpp     | 4 ----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/storm-cli-utilities/model-handling.h b/src/storm-cli-utilities/model-handling.h
index b9589fbd8..49ce12dec 100644
--- a/src/storm-cli-utilities/model-handling.h
+++ b/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();
diff --git a/src/storm/builder/BuilderOptions.cpp b/src/storm/builder/BuilderOptions.cpp
index 2224efe11..b84e5b89d 100644
--- a/src/storm/builder/BuilderOptions.cpp
+++ b/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();
         }