more work on abstraction refinement framework

src/storm/modelchecker/abstraction/AbstractAbstractionRefinementModelChecker.cpp

@@ -119,13 +119,11 @@ namespace storm {
                 STORM_LOG_TRACE("Model in iteration " << iterations << " has " << abstractModel->getNumberOfStates() << " states and " << abstractModel->getNumberOfTransitions() << " transitions (retrieved in " << std::chrono::duration_cast<std::chrono::milliseconds>(abstractionEnd - abstractionStart).count() << "ms).");
 
                 // Obtain lower and upper bounds from the abstract model.
-                std::pair<std::unique_ptr<CheckResult>, std::unique_ptr<CheckResult>> bounds = computeBounds(*abstractModel);
+                computeBounds(*abstractModel);
                 
                 // Try to derive the final result from the obtained bounds.
-                std::unique_ptr<CheckResult> finalResult = tryToObtainResultFromBounds(abstractModel, bounds);
-                if (finalResult) {
-                    result = std::move(finalResult);
-                } else {
+                result = tryToObtainResultFromBounds(abstractModel, this->bounds);
+                if (!result) {
                     auto refinementStart = std::chrono::high_resolution_clock::now();
                     this->refineAbstractModel();
                     auto refinementEnd = std::chrono::high_resolution_clock::now();
@@ -161,6 +159,55 @@ namespace storm {
             bool doSkipQuantitativeSolution = skipQuantitativeSolution(abstractModel, qualitativeResults, checkTask);
             STORM_LOG_TRACE("" << (doSkipQuantitativeSolution ? "Skipping" : "Not skipping") << " quantitative solution.");
 
+            // Phase (2): solve quantitatively.
+            if (!doSkipQuantitativeSolution) {
+                result = computeQuantitativeResult(abstractModel, checkTask, constraintTargetStates.first, constraintTargetStates.second, qualitativeResults);
+                
+//                storm::modelchecker::SymbolicQualitativeCheckResult<DdType> initialStateFilter(quotient.getReachableStates(), quotient.getInitialStates());
+//                result.first->filter(initialStateFilter);
+//                result.second->filter(initialStateFilter);
+//                printBoundsInformation(result);
+//
+//                // Check whether the answer can be given after the quantitative solution.
+//                if (checkForResult(abstractModel, true, result.first->asQuantitativeCheckResult<ValueType>(), checkTask)) {
+//                    result.second = nullptr;
+//                }
+//                if (checkForResult(abstractModel, false, result.second->asQuantitativeCheckResult<ValueType>(), checkTask)) {
+//                    result.first = nullptr;
+//                }
+            } else {
+                // In this case, we construct the full results from the qualitative results.
+                
+            }
+            
+            //
+            fullResults = result;
+            
+            return result;
+        }
+        
+        template<typename ModelType>
+        bool AbstractAbstractionRefinementModelChecker<ModelType>::skipQuantitativeSolution(storm::models::Model<ValueType> const& abstractModel) {
+            STORM_LOG_THROW(abstractModel.isSymbolicModel(), storm::exceptions::NotSupportedException, "Expected symbolic model.");
+            
+            return skipQuantitativeSolution(*abstractModel.template as<storm::models::symbolic::Model<DdType, ValueType>>());
+        }
+
+        template<typename ModelType>
+        bool AbstractAbstractionRefinementModelChecker<ModelType>::skipQuantitativeSolution(storm::models::symbolic::Model<DdType, ValueType> const& abstractModel) {
+            bool isRewardFormula = checkTask->getFormula().isEventuallyFormula() && checkTask->getFormula().asEventuallyFormula().getContext() == storm::logic::FormulaContext::Reward;
+            if (isRewardFormula) {
+                if ((abstractModel.getInitialStates() && qualitativeResults->asSymbolicQualitativeResultMinMax<DdType>().getProb1Min().getStates()) != (abstractModel.getInitialStates() && qualitativeResults->asSymbolicQualitativeResultMinMax<DdType>().getProb1Max().getStates())) {
+                    return true;
+                }
+            } else {
+                if ((abstractModel.getInitialStates() && qualitativeResults->asSymbolicQualitativeResultMinMax<DdType>().getProb0Min().getStates()) != (abstractModel.getInitialStates() && qualitativeResults->asSymbolicQualitativeResultMinMax<DdType>().getProb0Max().getStates())) {
+                    return true;
+                } else if ((abstractModel.getInitialStates() && qualitativeResults->asSymbolicQualitativeResultMinMax<DdType>().getProb1Min().getStates()) != (abstractModel.getInitialStates() && qualitativeResults->asSymbolicQualitativeResultMinMax<DdType>().getProb1Max().getStates())) {
+                    return true;
+                }
+            }
+            return false;
         }
         
         template<typename ModelType>
@@ -390,7 +437,7 @@ namespace storm {
         }
         
         template<typename ModelType>
-        std::unique_ptr<CheckResult> AbstractAbstractionRefinementModelChecker<ModelType>::tryToObtainResultFromBounds(std::shared_ptr<storm::models::Model<ValueType>> const& abstractModel, std::pair<std::unique_ptr<CheckResult>, std::unique_ptr<CheckResult>>& bounds) {
+        std::unique_ptr<CheckResult> AbstractAbstractionRefinementModelChecker<ModelType>::tryToObtainResultFromBounds(storm::models::Model<ValueType> const& abstractModel, std::pair<std::unique_ptr<CheckResult>, std::unique_ptr<CheckResult>>& bounds) {
             std::unique_ptr<CheckResult> result;
             
             if (bounds.first == nullptr || bounds.second == nullptr) {
@@ -408,7 +455,7 @@ namespace storm {
             }
             
             if (result) {
-                abstractModel->printModelInformationToStream(std::cout);
+                abstractModel.printModelInformationToStream(std::cout);
             }
             
             return result;

src/storm/modelchecker/abstraction/AbstractAbstractionRefinementModelChecker.h

@@ -105,8 +105,8 @@ namespace storm {
             /// Performs the actual abstraction refinement loop.
             std::unique_ptr<CheckResult> performAbstractionRefinement();
             
-            /// Computes lower and upper bounds on the
-            std::pair<std::unique_ptr<CheckResult>, std::unique_ptr<CheckResult>> computeBounds(storm::models::Model<ValueType> const& abstractModel);
+            /// Computes lower and upper bounds on the abstract model and stores them in a member.
+            void computeBounds(storm::models::Model<ValueType> const& abstractModel);
             
             /// Solves the current check task qualitatively, i.e. computes all states with probability 0/1.
             std::unique_ptr<storm::abstraction::QualitativeResultMinMax> computeQualitativeResult(storm::models::Model<ValueType> const& abstractModel, storm::abstraction::StateSet const& constraintStates, storm::abstraction::StateSet const& targetStates);
@@ -118,10 +118,14 @@ namespace storm {
             std::unique_ptr<CheckResult> checkForResultAfterQualitativeCheck(storm::models::Model<ValueType> const& abstractModel);
             std::unique_ptr<CheckResult> checkForResultAfterQualitativeCheck(storm::models::symbolic::Model<DdType, ValueType> const& abstractModel);
             
+            // Methods related to the quantitative solution.
+            bool skipQuantitativeSolution(storm::models::Model<ValueType> const& abstractModel);
+            bool skipQuantitativeSolution(storm::models::symbolic::Model<DdType, ValueType> const& abstractModel);
+
             /// Tries to obtain the results from the bounds. If either of the two bounds is null, the result is assumed
             /// to be the non-null bound. If neither is null and the bounds are sufficiently close, the average of the
             /// bounds is returned.
-            std::unique_ptr<CheckResult> tryToObtainResultFromBounds(std::shared_ptr<storm::models::Model<ValueType>> const& model, std::pair<std::unique_ptr<CheckResult>, std::unique_ptr<CheckResult>>& bounds);
+            std::unique_ptr<CheckResult> tryToObtainResultFromBounds(storm::models::Model<ValueType> const& model, std::pair<std::unique_ptr<CheckResult>, std::unique_ptr<CheckResult>>& bounds);
             /// Checks whether the provided bounds are sufficiently close to terminate.
             bool boundsAreSufficientlyClose(std::pair<std::unique_ptr<CheckResult>, std::unique_ptr<CheckResult>> const& bounds);
             /// Retrieves the average of the two bounds. This should only be used to derive the overall result when the
@@ -148,6 +152,9 @@ namespace storm {
             
             /// The last qualitative results.
             std::unique_ptr<storm::abstraction::QualitativeResultMinMax> qualitativeResults;
+            
+            /// The last full result that was obtained.
+            std::pair<std::unique_ptr<CheckResult>, std::unique_ptr<CheckResult>> bounds;
         };
     }
 }