Merge branch 'master' into dft

src/storm-pars/settings/modules/RegionSettings.cpp

@@ -137,7 +137,9 @@ namespace storm {
             bool RegionSettings::check() const {
                 if (isRefineSet() && isExtremumSet()) {
                     STORM_LOG_ERROR("Can not compute extremum values AND perform region refinement.");
+                    return false;
                 }
+                return true;
             }
 
             bool RegionSettings::isPrintNoIllustrationSet() const {

src/storm/storage/dd/bisimulation/NondeterministicModelPartitionRefiner.cpp

@@ -8,7 +8,7 @@ namespace storm {
         namespace bisimulation {
             
             template<storm::dd::DdType DdType, typename ValueType>
-            NondeterministicModelPartitionRefiner<DdType, ValueType>::NondeterministicModelPartitionRefiner(storm::models::symbolic::NondeterministicModel<DdType, ValueType> const& model, Partition<DdType, ValueType> const& initialStatePartition) : PartitionRefiner<DdType, ValueType>(model, initialStatePartition), model(model), choicePartition(Partition<DdType, ValueType>::createTrivialChoicePartition(model, initialStatePartition.getBlockVariables())), stateSignatureRefiner(model.getManager(), this->statePartition.getBlockVariable(), model.getRowVariables(), model.getColumnVariables(), true) {
+            NondeterministicModelPartitionRefiner<DdType, ValueType>::NondeterministicModelPartitionRefiner(storm::models::symbolic::NondeterministicModel<DdType, ValueType> const& model, Partition<DdType, ValueType> const& initialStatePartition) : PartitionRefiner<DdType, ValueType>(model, initialStatePartition), model(model), choicePartition(Partition<DdType, ValueType>::createTrivialChoicePartition(model, initialStatePartition.getBlockVariables())), stateSignatureRefiner(model.getManager(), this->statePartition.getBlockVariable(), model.getRowVariables(), model.getColumnVariables(), true), statePartitonHasBeenRefinedOnce(false) {
 
                 // For Markov automata, we refine the state partition wrt. to their exit rates.
                 if (model.isOfType(storm::models::ModelType::MarkovAutomaton)) {
@@ -29,7 +29,9 @@ namespace storm {
                 STORM_LOG_TRACE("Refining choice partition.");
                 Partition<DdType, ValueType> newChoicePartition = this->internalRefine(this->signatureComputer, this->signatureRefiner, this->choicePartition, this->statePartition, mode);
                 
-                if (newChoicePartition.getNumberOfBlocks() == choicePartition.getNumberOfBlocks()) {
+                // If the choice partition has become stable in an iteration that is not the starting one, we have
+                // reached a fixed point and can return.
+                if (newChoicePartition.getNumberOfBlocks() == choicePartition.getNumberOfBlocks() && statePartitonHasBeenRefinedOnce) {
                     this->status = Status::FixedPoint;
                     return false;
                 } else {
@@ -52,6 +54,7 @@ namespace storm {
                     STORM_LOG_TRACE("Refining state partition.");
                     auto refinementStart = std::chrono::high_resolution_clock::now();
                     Partition<DdType, ValueType> newStatePartition = this->internalRefine(stateSignature, this->stateSignatureRefiner, this->statePartition);
+                    statePartitonHasBeenRefinedOnce = true;
                     auto refinementEnd = std::chrono::high_resolution_clock::now();
                     
                     auto signatureTime = std::chrono::duration_cast<std::chrono::milliseconds>(signatureEnd - signatureStart).count();

src/storm/storage/dd/bisimulation/NondeterministicModelPartitionRefiner.h

@@ -36,14 +36,17 @@ namespace storm {
                 
                 virtual bool refineWrtStateRewards(storm::dd::Add<DdType, ValueType> const& stateRewards) override;
                 
-                // The model to refine.
+                /// The model to refine.
                 storm::models::symbolic::NondeterministicModel<DdType, ValueType> const& model;
                 
-                // The choice partition in the refinement process.
+                /// The choice partition in the refinement process.
                 Partition<DdType, ValueType> choicePartition;
 
-                // The object used to refine the state partition based on the signatures.
+                /// The object used to refine the state partition based on the signatures.
                 SignatureRefiner<DdType, ValueType> stateSignatureRefiner;
+                
+                /// A flag indicating whether the state partition has been refined at least once.
+                bool statePartitonHasBeenRefinedOnce;
             };
             
         }