Code style for formula classes

src/formula/AP.h

@@ -25,9 +25,8 @@ namespace formula {
  */
 template <class T>
 class AP : public PCTLStateFormula<T> {
-   private:
-   std::string ap;
-   public:
+
+public:
 	/*!
 	 * Constructor
 	 *
@@ -93,6 +92,9 @@ class AP : public PCTLStateFormula<T> {
 	virtual mrmc::storage::BitVector *check(mrmc::modelChecker::DtmcPrctlModelChecker<T>* modelChecker) {
 	  return modelChecker->checkAP(this);
 	}
+
+private:
+	std::string ap;
 };
 
 } //namespace formula

src/formula/And.h

@@ -32,10 +32,8 @@ namespace formula {
  */
 template <class T>
 class And : public PCTLStateFormula<T> {
-   private:
-      PCTLStateFormula<T>* left;
-      PCTLStateFormula<T>* right;
-   public:
+
+public:
 	/*!
 	 * Empty constructor.
 	 * Will create an AND-node without subnotes. Will not represent a complete formula!
@@ -147,6 +145,9 @@ class And : public PCTLStateFormula<T> {
 		return modelChecker->checkAnd(this);
 	}
 
+private:
+	PCTLStateFormula<T>* left;
+	PCTLStateFormula<T>* right;
 };
 
 } //namespace formula

src/formula/BoundedUntil.h

@@ -36,10 +36,8 @@ namespace formula {
  */
 template <class T>
 class BoundedUntil : public PCTLPathFormula<T> {
-      PCTLStateFormula<T>* left;
-      PCTLStateFormula<T>* right;
-      uint_fast64_t bound;
-   public:
+
+public:
 	/*!
 	 * Empty constructor
 	 */
@@ -172,6 +170,11 @@ class BoundedUntil : public PCTLPathFormula<T> {
 	virtual std::vector<T> *check(mrmc::modelChecker::DtmcPrctlModelChecker<T>* modelChecker) {
 	  return modelChecker->checkBoundedUntil(this);
 	}
+
+private:
+	PCTLStateFormula<T>* left;
+	PCTLStateFormula<T>* right;
+	uint_fast64_t bound;
 };
 
 } //namespace formula

src/formula/Next.h

@@ -32,9 +32,8 @@ namespace formula {
  */
 template <class T>
 class Next : public PCTLPathFormula<T> {
-   private:
-      PCTLStateFormula<T>* child;
-   public:
+
+public:
 	/*!
 	 * Empty constructor
 	 */
@@ -116,6 +115,9 @@ class Next : public PCTLPathFormula<T> {
 	virtual std::vector<T> *check(mrmc::modelChecker::DtmcPrctlModelChecker<T>* modelChecker) {
 	  return modelChecker->checkNext(this);
 	}
+
+private:
+	PCTLStateFormula<T>* child;
 };
 
 } //namespace formula

src/formula/Not.h

@@ -28,9 +28,8 @@ namespace formula {
  */
 template <class T>
 class Not : public PCTLStateFormula<T> {
-   private:
-      PCTLStateFormula<T>* child;
-   public:
+
+public:
 	/*!
 	 * Empty constructor
 	 */
@@ -109,6 +108,9 @@ class Not : public PCTLStateFormula<T> {
 	virtual mrmc::storage::BitVector *check(mrmc::modelChecker::DtmcPrctlModelChecker<T>* modelChecker) {
 	  return modelChecker->checkNot(this);
 	}
+
+private:
+	PCTLStateFormula<T>* child;
 };
 
 } //namespace formula

src/formula/Or.h

@@ -31,10 +31,8 @@ namespace formula {
  */
 template <class T>
 class Or : public PCTLStateFormula<T> {
-   private:
-      PCTLStateFormula<T>* left;
-      PCTLStateFormula<T>* right;
-   public:
+
+public:
 	/*!
 	 * Empty constructor.
 	 * Will create an AND-node without subnotes. Will not represent a complete formula!
@@ -145,6 +143,10 @@ class Or : public PCTLStateFormula<T> {
 	virtual mrmc::storage::BitVector *check(mrmc::modelChecker::DtmcPrctlModelChecker<T>* modelChecker) {
 	  return modelChecker->checkOr(this);
 	}
+
+private:
+	PCTLStateFormula<T>* left;
+	PCTLStateFormula<T>* right;
 };
 
 } //namespace formula

src/formula/PCTLPathFormula.h

@@ -27,7 +27,8 @@ namespace formula {
  */
 template <class T>
 class PCTLPathFormula : public PCTLFormula<T> {
-   public:
+
+public:
 	/*!
 	 * empty destructor
 	 */

src/formula/PCTLStateFormula.h

@@ -27,7 +27,8 @@ namespace formula {
  */
 template <class T>
 class PCTLStateFormula : public PCTLFormula<T> {
-   public:
+
+public:
 	/*!
 	 * empty destructor
 	 */

src/formula/PCTLformula.h

@@ -27,7 +27,8 @@ namespace formula {
  */
 template <class T>
 class PCTLFormula {
-   public:
+
+public:
 	/*!
 	 * virtual destructor
 	 */

src/formula/ProbabilisticOperator.h

@@ -34,10 +34,8 @@ namespace formula {
  */
 template<class T>
 class ProbabilisticOperator : public PCTLStateFormula<T> {
-      T lower;
-      T upper;
-      PCTLPathFormula<T>* pathFormula;
-   public:
+
+public:
 	/*!
 	 * Empty constructor
 	 */
@@ -156,6 +154,11 @@ class ProbabilisticOperator : public PCTLStateFormula<T> {
 	virtual mrmc::storage::BitVector *check(mrmc::modelChecker::DtmcPrctlModelChecker<T>* modelChecker) {
 	  return modelChecker->checkProbabilisticOperator(this);
 	}
+
+private:
+	T lower;
+	T upper;
+	PCTLPathFormula<T>* pathFormula;
 };
 
 } //namespace formula

src/formula/Until.h

@@ -33,9 +33,8 @@ namespace formula {
  */
 template <class T>
 class Until : public PCTLPathFormula<T> {
-      PCTLStateFormula<T>* left;
-      PCTLStateFormula<T>* right;
-   public:
+
+public:
 	/*!
 	 * Empty constructor
 	 */
@@ -144,6 +143,10 @@ class Until : public PCTLPathFormula<T> {
 	virtual std::vector<T> *check(mrmc::modelChecker::DtmcPrctlModelChecker<T>* modelChecker) {
 	  return modelChecker->checkUntil(this);
 	}
+
+private:
+	PCTLStateFormula<T>* left;
+	PCTLStateFormula<T>* right;
 };
 
 } //namespace formula