Merge pull request '[STORM PR] Fixes after LTL merge' (#47) from merge_pr_137 into main

Reviewed-on: https://git.pranger.xyz/TEMPEST/tempest-devel/pulls/47

src/storm/logic/Formula.h

@@ -149,9 +149,6 @@ namespace storm {
             HOAPathFormula& asHOAPathFormula();
             HOAPathFormula const& asHOAPathFormula() const;
 
-            HOAPathFormula& asHOAPathFormula();
-            HOAPathFormula const& asHOAPathFormula() const;
-
             BoundedUntilFormula& asBoundedUntilFormula();
             BoundedUntilFormula const& asBoundedUntilFormula() const;
 

src/storm/logic/FragmentSpecification.cpp

@@ -114,35 +114,6 @@ namespace storm {
             return rpatl;
         }
 
-        FragmentSpecification prctl() {
-            FragmentSpecification prctl = pctl();
-
-            prctl.setRewardOperatorsAllowed(true);
-            prctl.setCumulativeRewardFormulasAllowed(true);
-            prctl.setInstantaneousFormulasAllowed(true);
-            prctl.setReachabilityRewardFormulasAllowed(true);
-            prctl.setLongRunAverageOperatorsAllowed(true);
-            prctl.setStepBoundedCumulativeRewardFormulasAllowed(true);
-            prctl.setTimeBoundedCumulativeRewardFormulasAllowed(true);
-
-            return prctl;
-        }
-
-        FragmentSpecification prctlstar() {
-            FragmentSpecification prctlstar = pctlstar();
-
-            prctlstar.setRewardOperatorsAllowed(true);
-            prctlstar.setCumulativeRewardFormulasAllowed(true);
-            prctlstar.setInstantaneousFormulasAllowed(true);
-            prctlstar.setReachabilityRewardFormulasAllowed(true);
-            prctlstar.setLongRunAverageOperatorsAllowed(true);
-            prctlstar.setStepBoundedCumulativeRewardFormulasAllowed(true);
-            prctlstar.setTimeBoundedCumulativeRewardFormulasAllowed(true);
-
-            return prctlstar;
-
-        }
-
         FragmentSpecification csl() {
             FragmentSpecification csl = pctl();
 

src/storm/logic/ToPrefixStringVisitor.cpp

@@ -59,6 +59,11 @@ namespace storm {
             return result;
         }
 
+        boost::any ToPrefixStringVisitor::visit(BoundedGloballyFormula const&, boost::any const&) const {
+            STORM_LOG_THROW(false, storm::exceptions::InvalidOperationException, "Can not convert to prefix string");
+        }
+
+
         boost::any ToPrefixStringVisitor::visit(BoundedUntilFormula const&, boost::any const&) const {
             STORM_LOG_THROW(false, storm::exceptions::InvalidOperationException, "Can not convert to prefix string");
         }

src/storm/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.cpp

@@ -93,8 +93,8 @@ namespace storm {
             STORM_LOG_THROW(checkTask.isOptimizationDirectionSet(), storm::exceptions::InvalidPropertyException, "Formula needs to specify whether minimal or maximal values are to be computed on nondeterministic model.");
             std::unique_ptr<CheckResult> subResultPointer = this->check(env, pathFormula.getSubformula());
             ExplicitQualitativeCheckResult const& subResult = subResultPointer->asExplicitQualitativeCheckResult();
-            std::vector<ValueType> numericResult = storm::modelchecker::helper::SparseMdpPrctlHelper<ValueType>::computeNextProbabilities(env, checkTask.getOptimizationDirection(), this->getModel().getTransitionMatrix(), subResult.getTruthValuesVector());
-            return std::unique_ptr<CheckResult>(new ExplicitQuantitativeCheckResult<ValueType>(std::move(numericResult)));
+            auto ret = storm::modelchecker::helper::SparseMdpPrctlHelper<ValueType>::computeNextProbabilities(env, storm::solver::SolveGoal<ValueType>(this->getModel(), checkTask), checkTask.getOptimizationDirection(), this->getModel().getTransitionMatrix(), subResult.getTruthValuesVector());
+            return std::unique_ptr<CheckResult>(new ExplicitQuantitativeCheckResult<ValueType>(std::move(ret.values)));
         }
 
         template<typename SparseMarkovAutomatonModelType>

src/storm/modelchecker/prctl/SparseDtmcPrctlModelChecker.cpp

@@ -141,33 +141,6 @@ namespace storm {
             return std::unique_ptr<CheckResult>(new ExplicitQuantitativeCheckResult<ValueType>(std::move(numericResult)));
         }
 
-        template<typename SparseDtmcModelType>
-        std::unique_ptr<CheckResult> SparseDtmcPrctlModelChecker<SparseDtmcModelType>::computeHOAPathProbabilities(Environment const& env, CheckTask<storm::logic::HOAPathFormula, ValueType> const& checkTask) {
-            storm::logic::HOAPathFormula const& pathFormula = checkTask.getFormula();
-            
-            storm::modelchecker::helper::SparseLTLHelper<ValueType, false> helper(this->getModel().getTransitionMatrix());
-            storm::modelchecker::helper::setInformationFromCheckTaskDeterministic(helper, checkTask, this->getModel());
-            
-            auto formulaChecker = [&] (storm::logic::Formula const& formula) { return this->check(env, formula)->asExplicitQualitativeCheckResult().getTruthValuesVector(); };
-            auto apSets = helper.computeApSets(pathFormula.getAPMapping(), formulaChecker);
-            std::vector<ValueType> numericResult = helper.computeDAProductProbabilities(env, *pathFormula.readAutomaton(), apSets);
-            
-            return std::unique_ptr<CheckResult>(new ExplicitQuantitativeCheckResult<ValueType>(std::move(numericResult)));
-        }
-
-        template<typename SparseDtmcModelType>
-        std::unique_ptr<CheckResult> SparseDtmcPrctlModelChecker<SparseDtmcModelType>::computeLTLProbabilities(Environment const& env, CheckTask<storm::logic::PathFormula, ValueType> const& checkTask) {
-            storm::logic::PathFormula const& pathFormula = checkTask.getFormula();
-
-            storm::modelchecker::helper::SparseLTLHelper<ValueType, false> helper(this->getModel().getTransitionMatrix());
-            storm::modelchecker::helper::setInformationFromCheckTaskDeterministic(helper, checkTask, this->getModel());
-            
-            auto formulaChecker = [&] (storm::logic::Formula const& formula) { return this->check(env, formula)->asExplicitQualitativeCheckResult().getTruthValuesVector(); };
-            std::vector<ValueType> numericResult = helper.computeLTLProbabilities(env, pathFormula, formulaChecker);
-
-            return std::unique_ptr<CheckResult>(new ExplicitQuantitativeCheckResult<ValueType>(std::move(numericResult)));
-        }
-
         template<typename SparseDtmcModelType>
         std::unique_ptr<CheckResult> SparseDtmcPrctlModelChecker<SparseDtmcModelType>::computeCumulativeRewards(Environment const& env, storm::logic::RewardMeasureType, CheckTask<storm::logic::CumulativeRewardFormula, ValueType> const& checkTask) {
 

src/storm/storage/Scheduler.cpp

@@ -323,9 +323,9 @@ namespace storm {
                 }
             }
             if (numOfSkippedStatesWithUniqueChoice > 0) {
-                stateString << "Skipped " << numOfSkippedStatesWithUniqueChoice << " deterministic states with unique choice." << std::endl;
+                out << "Skipped " << numOfSkippedStatesWithUniqueChoice << " deterministic states with unique choice." << std::endl;
             }
-            stateString << "___________________________________________________________________" << std::endl;
+            out << "___________________________________________________________________" << std::endl;
 
         }
 

src/storm/storage/Scheduler.h

@@ -143,8 +143,9 @@ namespace storm {
              * Prints the scheduler in json format to the given output stream.
              */
             void printJsonToStream(std::ostream& out, std::shared_ptr<storm::models::sparse::Model<ValueType>> model = nullptr, bool skipUniqueChoices = false,  bool skipDontCareStates = false) const;
+            void setPrintUndefinedChoices(bool value);
 
-        private:
+        protected:
             boost::optional<storm::storage::MemoryStructure> memoryStructure;
             std::vector<std::vector<SchedulerChoice<ValueType>>> schedulerChoices;