added more interfaces to AbstractModelChecker.

src/formula/AbstractFormula.h

@@ -14,7 +14,7 @@ namespace storm { namespace formula {
 template <class T> class AbstractFormula;
 }}
 
-#include "src/modelchecker/AbstractModelChecker.h"
+#include "src/modelchecker/ForwardDeclarations.h"
 #include "src/formula/AbstractFormulaChecker.h"
 
 namespace storm {

src/formula/AbstractPathFormula.h

@@ -13,7 +13,7 @@ template <class T> class AbstractPathFormula;
 }}
 
 #include "src/formula/AbstractFormula.h"
-#include "src/modelchecker/AbstractModelChecker.h"
+#include "src/modelchecker/ForwardDeclarations.h"
 
 #include <vector>
 #include <iostream>

src/formula/AbstractStateFormula.h

@@ -14,7 +14,7 @@ template <class T> class AbstractStateFormula;
 
 #include "src/formula/AbstractFormula.h"
 #include "src/storage/BitVector.h"
-#include "src/modelchecker/AbstractModelChecker.h"
+#include "src/modelchecker/ForwardDeclarations.h"
 
 namespace storm {
 namespace formula {

src/formula/And.h

@@ -10,7 +10,7 @@
 
 #include "src/formula/AbstractStateFormula.h"
 #include "src/formula/AbstractFormulaChecker.h"
-#include "src/modelchecker/AbstractModelChecker.h"
+#include "src/modelchecker/ForwardDeclarations.h"
 #include <string>
 
 namespace storm {

src/formula/Ap.h

@@ -10,7 +10,7 @@
 
 #include "src/formula/AbstractStateFormula.h"
 #include "src/formula/AbstractFormulaChecker.h"
-#include "src/modelchecker/AbstractModelChecker.h"
+#include "src/modelchecker/ForwardDeclarations.h"
 
 namespace storm {
 namespace formula {

src/formula/BoundedEventually.h

@@ -13,7 +13,7 @@
 #include "src/formula/AbstractFormulaChecker.h"
 #include "boost/integer/integer_mask.hpp"
 #include <string>
-#include "src/modelchecker/AbstractModelChecker.h"
+#include "src/modelchecker/ForwardDeclarations.h"
 
 namespace storm {
 

src/formula/BoundedNaryUntil.h

@@ -10,13 +10,12 @@
 
 #include "src/formula/AbstractPathFormula.h"
 #include "src/formula/AbstractStateFormula.h"
-#include "src/modelchecker/AbstractModelChecker.h"
 #include "boost/integer/integer_mask.hpp"
 #include <string>
 #include <vector>
 #include <tuple>
 #include <sstream>
-#include "src/formula/AbstractFormulaChecker.h"
+#include "src/modelchecker/ForwardDeclarations.h"
 
 namespace storm {
 namespace formula {

src/formula/BoundedUntil.h

@@ -10,10 +10,9 @@
 
 #include "src/formula/AbstractPathFormula.h"
 #include "src/formula/AbstractStateFormula.h"
-#include "src/modelchecker/AbstractModelChecker.h"
 #include "boost/integer/integer_mask.hpp"
 #include <string>
-#include "src/formula/AbstractFormulaChecker.h"
+#include "src/modelchecker/ForwardDeclarations.h"
 
 namespace storm {
 namespace formula {

src/formula/Eventually.h

@@ -10,7 +10,7 @@
 
 #include "src/formula/AbstractPathFormula.h"
 #include "src/formula/AbstractStateFormula.h"
-#include "src/modelchecker/AbstractModelChecker.h"
+#include "src/modelchecker/ForwardDeclarations.h"
 
 namespace storm {
 

src/formula/Formulas.h

@@ -10,11 +10,6 @@
 
 #include "modelchecker/ForwardDeclarations.h"
 
-#include "AbstractFormula.h"
-#include "AbstractPathFormula.h"
-#include "AbstractStateFormula.h"
-
-
 #include "And.h"
 #include "Ap.h"
 #include "BoundedUntil.h"
@@ -36,6 +31,10 @@
 #include "RewardNoBoundOperator.h"
 #include "SteadyStateOperator.h"
 
+#include "AbstractFormula.h"
+#include "AbstractPathFormula.h"
+#include "AbstractStateFormula.h"
+
 #include "modelchecker/DtmcPrctlModelChecker.h"
 
 #endif /* STORM_FORMULA_FORMULAS_H_ */

src/formula/Globally.h

@@ -11,6 +11,7 @@
 #include "AbstractPathFormula.h"
 #include "AbstractStateFormula.h"
 #include "src/formula/AbstractFormulaChecker.h"
+#include "src/modelchecker/ForwardDeclarations.h"
 
 namespace storm {
 

src/formula/Not.h

@@ -10,7 +10,7 @@
 
 #include "AbstractStateFormula.h"
 #include "src/formula/AbstractFormulaChecker.h"
-#include "src/modelchecker/AbstractModelChecker.h"
+#include "src/modelchecker/ForwardDeclarations.h"
 
 namespace storm {
 

src/formula/PathBoundOperator.h

@@ -11,7 +11,7 @@
 #include "src/formula/AbstractStateFormula.h"
 #include "src/formula/AbstractPathFormula.h"
 #include "src/formula/AbstractFormulaChecker.h"
-#include "src/modelchecker/AbstractModelChecker.h"
+#include "src/modelchecker/ForwardDeclarations.h"
 #include "src/utility/ConstTemplates.h"
 
 namespace storm {

src/modelchecker/AbstractModelChecker.h

@@ -12,9 +12,7 @@ namespace storm { namespace modelChecker {
 template <class Type> class AbstractModelChecker;
 }}
 
-//#include "src/formula/Formulas.h"
-#include "src/formula/Or.h"
-#include "src/formula/Ap.h"
+#include "src/formula/Formulas.h"
 #include "src/storage/BitVector.h"
 
 #include <iostream>
@@ -33,8 +31,13 @@ namespace modelChecker {
  */
 template<class Type>
 class AbstractModelChecker :
-	public virtual storm::formula::IOrModelChecker<Type>,
-	public virtual storm::formula::IApModelChecker<Type>
+	public virtual storm::formula::IApModelChecker<Type>,
+	public virtual storm::formula::IAndModelChecker<Type>,
+	public virtual storm::formula::IEventuallyModelChecker<Type>,
+	public virtual storm::formula::IGloballyModelChecker<Type>,
+	public virtual storm::formula::INextModelChecker<Type>,
+	public virtual storm::formula::INotModelChecker<Type>,
+	public virtual storm::formula::IOrModelChecker<Type>
 	{
 	
 public:

src/modelchecker/DtmcPrctlModelChecker.h

@@ -41,8 +41,7 @@ template<class Type>
 class DtmcPrctlModelChecker : 
 	public virtual AbstractModelChecker<Type>, 
 	public virtual storm::formula::INoBoundOperatorModelChecker<Type>,
-	public virtual storm::formula::IReachabilityRewardModelChecker<Type>,
-	public virtual storm::formula::IEventuallyModelChecker<Type>
+	public virtual storm::formula::IReachabilityRewardModelChecker<Type>
 	{
 public:
 	/*!

src/modelchecker/ForwardDeclarations.h

@@ -13,6 +13,9 @@ namespace storm {
 
 namespace modelChecker {
 
+template <class Type>
+class AbstractModelChecker;
+
 template <class Type>
 class DtmcPrctlModelChecker;