SMG LRA can now be used for Optimal Shields

src/storm/modelchecker/helper/infinitehorizon/SparseNondeterministicGameInfiniteHorizonHelper.cpp

@@ -52,6 +52,12 @@ namespace storm {
                 return scheduler;
             }
 
+            template <typename ValueType>
+            std::vector<ValueType> SparseNondeterministicGameInfiniteHorizonHelper<ValueType>::getChoiceValues() const {
+                STORM_LOG_ASSERT(this->isProduceChoiceValuesSet(), "Trying to get the computed choice values although this was not requested.");
+                STORM_LOG_ASSERT(this->_choiceValues.is_initialized(), "Trying to get the computed choice values but none were available. Was there a computation call before?");
+                return this->_choiceValues.get();
+            }
 
             template <typename ValueType>
             void SparseNondeterministicGameInfiniteHorizonHelper<ValueType>::createDecomposition() {
@@ -65,8 +71,6 @@ namespace storm {
                     this->_computedLongRunComponentDecomposition = std::make_unique<storm::storage::GameMaximalEndComponentDecomposition<ValueType>>(this->_transitionMatrix, *this->_backwardTransitions);
 
                     this->_longRunComponentDecomposition = this->_computedLongRunComponentDecomposition.get();
-                    //STORM_LOG_DEBUG("\n" << this->_transitionMatrix);
-                    STORM_LOG_DEBUG("GMEC: " << *(this->_longRunComponentDecomposition));
                 }
             }
 
@@ -91,6 +95,13 @@ namespace storm {
                     }
                     this->_producedOptimalChoices->resize(this->_transitionMatrix.getRowGroupCount());
                 }
+                // Allocate memory for the choice values.
+                if (this->isProduceChoiceValuesSet()) {
+                    if (!this->_choiceValues.is_initialized()) {
+                        this->_choiceValues.emplace();
+                    }
+                    this->_choiceValues->resize(this->_transitionMatrix.getRowCount());
+                }
 
                 storm::solver::LraMethod method = env.solver().lra().getNondetLraMethod();
                 if (method == storm::solver::LraMethod::LinearProgramming) {
@@ -111,13 +122,17 @@ namespace storm {
                 if (this->isProduceSchedulerSet()) {
                     optimalChoices = &this->_producedOptimalChoices.get();
                 }
+                std::vector<ValueType>* choiceValues = nullptr;
+                if (this->isProduceChoiceValuesSet()) {
+                    choiceValues = &this->_choiceValues.get();
+                }
 
                 // Now create a helper and perform the algorithm
                 if (this->isContinuousTime()) {
                     STORM_LOG_THROW(false, storm::exceptions::InternalException, "We cannot handle continuous time games.");
                 } else {
                     storm::modelchecker::helper::internal::LraViHelper<ValueType, storm::storage::MaximalEndComponent, storm::modelchecker::helper::internal::LraViTransitionsType::GameNondetTsNoIs> viHelper(mec, this->_transitionMatrix, aperiodicFactor, nullptr, nullptr, &statesOfCoalition);
-                    return viHelper.performValueIteration(env, stateRewardsGetter, actionRewardsGetter, nullptr, &this->getOptimizationDirection(), optimalChoices);
+                    return viHelper.performValueIteration(env, stateRewardsGetter, actionRewardsGetter, nullptr, &this->getOptimizationDirection(), optimalChoices, choiceValues);
                 }
             }
 

src/storm/modelchecker/helper/infinitehorizon/SparseNondeterministicGameInfiniteHorizonHelper.h

@@ -58,6 +58,11 @@ namespace storm {
                  */
                 storm::storage::Scheduler<ValueType> extractScheduler() const;
 
+                /*!
+                 * @return the computed choice values for the states.
+                 */
+                std::vector<ValueType> getChoiceValues() const;
+
                 ValueType computeLraForComponent(Environment const& env, ValueGetter const& stateValuesGetter,  ValueGetter const& actionValuesGetter, storm::storage::MaximalEndComponent const& component);
 
                 ValueType computeLraVi(Environment const& env, ValueGetter const& stateValuesGetter, ValueGetter const& actionValuesGetter, storm::storage::MaximalEndComponent const& mec);

src/storm/modelchecker/helper/infinitehorizon/SparseNondeterministicInfiniteHorizonHelper.cpp

@@ -89,7 +89,7 @@ namespace storm {
                     this->_producedOptimalChoices->resize(this->_transitionMatrix.getRowGroupCount());
                 }
                 // Allocate memory for the choice values.
-                if (this->isProduceSchedulerSet()) {
+                if (this->isProduceChoiceValuesSet()) {
                     if (!this->_choiceValues.is_initialized()) {
                         this->_choiceValues.emplace();
                     }

src/storm/modelchecker/helper/infinitehorizon/internal/LraViHelper.cpp

@@ -214,7 +214,7 @@ namespace storm {
                         STORM_LOG_TRACE("LRA computation converged after " << iter << " iterations.");
                     }
 
-                    if (choices) {
+                    if (choices || choiceValues) {
                         // We will be doing one more iteration step and track scheduler choices this time.
                         if(!gameNondetTs()) {
                             prepareNextIteration(env);
@@ -222,8 +222,11 @@ namespace storm {
                         performIterationStep(env, dir, choices, choiceValues);
                     }
                     if(gameNondetTs()) {
-                      storm::utility::vector::applyPointwise<ValueType, ValueType>(xNew(), xNew(), [&iter] (ValueType const& x_i) -> ValueType { return x_i / (double)iter; });
-                      result = (xOld().at(0) * _uniformizationRate)/(double)iter; // TODO is "init" always going to be .at(0) ?
+                        storm::utility::vector::applyPointwise<ValueType, ValueType>(xNew(), xNew(), [&iter] (ValueType const& x_i) -> ValueType { return x_i / (double)iter; });
+                        result = (xOld().at(0) * _uniformizationRate)/(double)iter; // TODO is "init" always going to be .at(0) ?
+                        if(choiceValues) {
+                            storm::utility::vector::applyPointwise<ValueType, ValueType>(*choiceValues, *choiceValues, [this, &iter] (ValueType const& c_i) -> ValueType { return (c_i * _uniformizationRate) / (double)iter; });
+                        }
                     }
                     return result;
                 }
@@ -360,13 +363,16 @@ namespace storm {
                 template <typename ValueType, typename ComponentType, LraViTransitionsType TransitionsType>
                 void LraViHelper<ValueType, ComponentType, TransitionsType>::setInputModelChoiceValues(std::vector<ValueType>& choiceValues, std::vector<ValueType> const& localMecChoiceValues) const {
                     // Transform the local choiceValues (within this mec) to choice values for the input model
+
                     uint64_t localState = 0;
+                    uint64_t choiceValuesOffset = 0;
                     for (auto const& element : _component) {
                         uint64_t elementState = element.first;
                         uint64_t rowIndex = _transitionMatrix.getRowGroupIndices()[elementState];
                         uint64_t rowGroupSize = _transitionMatrix.getRowGroupEntryCount(elementState);
-                        std::copy(localMecChoiceValues.begin(), localMecChoiceValues.begin() + rowGroupSize, &choiceValues.at(rowIndex));
+                        std::copy(localMecChoiceValues.begin() + choiceValuesOffset, localMecChoiceValues.begin() + choiceValuesOffset + rowGroupSize, &choiceValues.at(rowIndex));
                         localState++;
+                        choiceValuesOffset += rowGroupSize;
                     }
                 }
 
@@ -386,7 +392,7 @@ namespace storm {
 
                     // Compute the values obtained by a single uniformization step between timed states only
                     if (nondetTs() && !gameNondetTs()) {
-                        if (choices == nullptr) {
+                        if (choices == nullptr && choiceValues == nullptr) {
                             _TsMultiplier->multiplyAndReduce(env, *dir, xOld(), &_TsChoiceValues, xNew());
                         } else {
                             // Also keep track of the choices made.
@@ -401,8 +407,12 @@ namespace storm {
                             // Note that nondeterminism within the timed states means that there can not be instant states (We either have MDPs or MAs)
                             // Hence, in this branch we don't have to care for choices at instant states.
                             STORM_LOG_ASSERT(!_hasInstantStates, "Nondeterministic timed states are only supported if there are no instant states.");
-                            setInputModelChoices(*choices, tsChoices);
-                            setInputModelChoiceValues(*choiceValues, resultChoiceValues);
+                            if(choices != nullptr) {
+                                setInputModelChoices(*choices, tsChoices);
+                            }
+                            if(choiceValues != nullptr) {
+                                setInputModelChoiceValues(*choiceValues, resultChoiceValues);
+                            }
                         }
                     } else if(gameNondetTs()) { // TODO DRYness? exact same behaviour as case above?
                         if (choices == nullptr) {
@@ -417,8 +427,12 @@ namespace storm {
                             rowGroupIndices.erase(rowGroupIndices.begin());
                             _TsMultiplier->reduce(env, *dir, rowGroupIndices, resultChoiceValues, xNew(), &tsChoices);
 
-                            setInputModelChoices(*choices, tsChoices); // no components -> no need for that call?
-                            setInputModelChoiceValues(*choiceValues, resultChoiceValues);
+                            if(choices != nullptr) {
+                                setInputModelChoices(*choices, tsChoices); // no components -> no need for that call?
+                            }
+                            if(choiceValues != nullptr) {
+                                setInputModelChoiceValues(*choiceValues, resultChoiceValues);
+                            }
                         }
                     } else {
                         _TsMultiplier->multiply(env, xOld(), &_TsChoiceValues, xNew());