diff --git a/src/storm-parsers/parser/FormulaParserGrammar.cpp b/src/storm-parsers/parser/FormulaParserGrammar.cpp index 0fb923dc0..7b51a552d 100644 --- a/src/storm-parsers/parser/FormulaParserGrammar.cpp +++ b/src/storm-parsers/parser/FormulaParserGrammar.cpp @@ -140,18 +140,6 @@ namespace storm { gameFormula = (qi::lit("<<") > playerCoalition > qi::lit(">>") > operatorFormula)[qi::_val = phoenix::bind(&FormulaParserGrammar::createGameFormula, phoenix::ref(*this), qi::_1, qi::_2)]; gameFormula.name("game formula"); - stateFormula = (orStateFormula | multiFormula | quantileFormula | gameFormula); - - coalitionOperator = (qi::lit("<<") - > *( (identifier[phoenix::push_back(qi::_a, qi::_1)] - | qi::int_[phoenix::push_back(qi::_a, qi::_1)]) % ',' - ) - > qi::lit(">>"))[qi::_val = phoenix::bind(&FormulaParserGrammar::createCoalition, phoenix::ref(*this), qi::_a)]; - coalitionOperator.name("coalition operator"); - - gameFormula = (coalitionOperator > operatorFormula)[qi::_val = phoenix::bind(&FormulaParserGrammar::createGameFormula, phoenix::ref(*this), qi::_1, qi::_2)]; - gameFormula.name("game formula"); - stateFormula = (orStateFormula | multiFormula | quantileFormula | gameFormula); stateFormula.name("state formula"); diff --git a/src/storm/logic/GameFormula.h b/src/storm/logic/GameFormula.h index 4ccb2de03..a14825cc5 100644 --- a/src/storm/logic/GameFormula.h +++ b/src/storm/logic/GameFormula.h @@ -20,6 +20,8 @@ namespace storm { virtual bool hasQualitativeResult() const override; virtual bool hasQuantitativeResult() const override; + virtual void gatherReferencedRewardModels(std::set& referencedRewardModels) const override; + virtual boost::any accept(FormulaVisitor const& visitor, boost::any const& data) const override; virtual std::ostream& writeToStream(std::ostream& out) const override; diff --git a/src/storm/models/sparse/Smg.cpp b/src/storm/models/sparse/Smg.cpp index 4e52f40bc..fc758bcc5 100644 --- a/src/storm/models/sparse/Smg.cpp +++ b/src/storm/models/sparse/Smg.cpp @@ -38,6 +38,7 @@ namespace storm { storm::storage::PlayerIndex Smg::getPlayerOfState(uint64_t stateIndex) const { STORM_LOG_ASSERT(stateIndex < this->getNumberOfStates(), "Invalid state index: " << stateIndex << "."); return statePlayerIndications[stateIndex]; + } template storm::storage::PlayerIndex Smg::getPlayerIndex(std::string const& playerName) const {