flagging multi-objective and quantile formulae as StateFormulae (fixing the previous commit)

Conflicts:
	src/storm/modelchecker/AbstractModelChecker.cpp

src/storm/logic/MultiObjectiveFormula.cpp

@@ -19,10 +19,6 @@ namespace storm {
             return true;
         }
         
-        bool MultiObjectiveFormula::isStateFormula() const {
-            return true;
-        }
-        
         bool MultiObjectiveFormula::hasQualitativeResult() const {
             for(auto const& subformula : this->subformulas){
                 if(subformula->hasQuantitativeResult()){

src/storm/logic/MultiObjectiveFormula.h

@@ -1,18 +1,17 @@
 #ifndef STORM_LOGIC_MULTIOBJECTIVEFORMULA_H_
 #define STORM_LOGIC_MULTIOBJECTIVEFORMULA_H_
 
-#include "storm/logic/Formula.h"
+#include "storm/logic/StateFormula.h"
 
 namespace storm {
     namespace logic {
-        class MultiObjectiveFormula : public Formula {
+        class MultiObjectiveFormula : public StateFormula {
         public:
             MultiObjectiveFormula(std::vector<std::shared_ptr<Formula const>> const& subformulas);
             
             virtual ~MultiObjectiveFormula();
             
             virtual bool isMultiObjectiveFormula() const override;
-            virtual bool isStateFormula() const override;
             
             virtual bool hasQualitativeResult() const override; // Result is true or false
             virtual bool hasQuantitativeResult() const override; // Result is numerical or a pareto curve

src/storm/logic/QuantileFormula.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "storm/logic/Formula.h"
+#include "storm/logic/StateFormula.h"
 
 namespace storm {
     namespace logic {
-        class QuantileFormula : public Formula {
+        class QuantileFormula : public StateFormula {
         public:
             QuantileFormula(std::vector<storm::expressions::Variable> const& boundVariables, std::shared_ptr<Formula const> subformula);
             

src/storm/modelchecker/AbstractModelChecker.cpp

@@ -237,6 +237,10 @@ namespace storm {
                 return this->checkBooleanLiteralFormula(env, checkTask.substituteFormula(stateFormula.asBooleanLiteralFormula()));
             } else if (stateFormula.isGameFormula()) {
                 return this->checkGameFormula(env, checkTask.substituteFormula(stateFormula.asGameFormula()));
+            } else if (stateFormula.isMultiObjectiveFormula()){
+                return this->checkMultiObjectiveFormula(env, checkTask.substituteFormula(stateFormula.asMultiObjectiveFormula()));
+            } else if (stateFormula.isQuantileFormula()){
+                return this->checkQuantileFormula(env, checkTask.substituteFormula(stateFormula.asQuantileFormula()));
             }
             STORM_LOG_THROW(false, storm::exceptions::InvalidArgumentException, "The given formula '" << stateFormula << "' is invalid.");
         }