Merge branch 'master' of https://sselab.de/lab9/private/git/MRMC

Conflicts:
	src/storage/SquareSparseMatrix.h

.gitignore

@@ -29,6 +29,7 @@ ipch/
 obj/
 CMakeFiles/
 # The build Dir
+build/
 build//CMakeLists.txt
 /*.vcxproj
 /*.filters

src/exceptions/BaseException.h

@@ -1,5 +1,5 @@
-#ifndef BASEEXCEPTION_H_
-#define BASEEXCEPTION_H_
+#ifndef MRMC_EXCEPTIONS_BASEEXCEPTION_H_
+#define MRMC_EXCEPTIONS_BASEEXCEPTION_H_
 
 #include <exception>
 #include <sstream>
@@ -16,6 +16,10 @@ class BaseException : public std::exception
 			: exception(cp), stream(cp.stream.str())
 		{
 		}
+
+		BaseException(const char* cstr) {
+			stream << cstr;
+		}
 		
 		~BaseException() throw() { }
 		
@@ -38,4 +42,18 @@ class BaseException : public std::exception
 } // namespace exceptions
 } // namespace mrmc
 
-#endif // BASEEXCEPTION_H_
+/* Macro to generate descendant exception classes.
+ * As all classes are nearly the same, this makes changing common features much easier.
+ */
+#define MRMC_EXCEPTION_DEFINE_NEW(exception_name) class exception_name : public BaseException<exception_name> { \
+public: \
+	exception_name() : BaseException() { \
+	} \
+	exception_name(const char* cstr) : BaseException(cstr) { \
+	} \
+	exception_name(const exception_name& cp) : BaseException(cp) { \
+	} \
+};
+
+
+#endif // MRMC_EXCEPTIONS_BASEEXCEPTION_H_

src/exceptions/FileIoException.h

@@ -0,0 +1,23 @@
+/*
+ * FileIoException.h
+ *
+ *  Created on: 16.08.2012
+ *      Author: Thomas Heinemann
+ */
+
+#ifndef MRMC_EXCEPTIONS_FILEIOEXCEPTION_H_
+#define MRMC_EXCEPTIONS_FILEIOEXCEPTION_H_
+
+#include "src/exceptions/BaseException.h"
+
+namespace mrmc {
+
+namespace exceptions {
+
+MRMC_EXCEPTION_DEFINE_NEW(FileIoException)
+
+}
+
+}
+
+#endif /* MRMC_EXCEPTIONS_FILEIOEXCEPTION_H_ */

src/exceptions/InvalidArgumentException.h

@@ -0,0 +1,18 @@
+#ifndef MRMC_EXCEPTIONS_INVALIDARGUMENTEXCEPTION_H_
+#define MRMC_EXCEPTIONS_INVALIDARGUMENTEXCEPTION_H_
+
+#include "src/exceptions/BaseException.h"
+
+namespace mrmc {
+
+namespace exceptions {
+
+/*!
+ * @brief This exception is thrown when a parameter is invalid in this context
+ */
+MRMC_EXCEPTION_DEFINE_NEW(InvalidArgumentException)
+
+} // namespace exceptions
+
+} // namespace mrmc
+#endif // MRMC_EXCEPTIONS_INVALIDARGUMENTEXCEPTION_H_

src/exceptions/InvalidSettings.h

@@ -1,16 +0,0 @@
-#ifndef INVALIDSETTINGS_H_
-#define INVALIDSETTINGS_H_
-
-#include "src/exceptions/BaseException.h"
-
-namespace mrmc {
-namespace exceptions {
-
-class InvalidSettings : public BaseException<InvalidSettings>
-{
-};
-
-} // namespace exceptions
-} // namespace mrmc
-
-#endif // INVALIDSETTINGS_H_

src/exceptions/InvalidSettingsException.h

@@ -0,0 +1,14 @@
+#ifndef MRMC_EXCEPTIONS_INVALIDSETTINGSEXCEPTION_H_
+#define MRMC_EXCEPTIONS_INVALIDSETTINGSEXCEPTION_H_
+
+#include "src/exceptions/BaseException.h"
+
+namespace mrmc {
+namespace exceptions {
+
+MRMC_EXCEPTION_DEFINE_NEW(InvalidSettingsException)
+
+} // namespace exceptions
+} // namespace mrmc
+
+#endif // MRMC_EXCEPTIONS_INVALIDSETTINGSEXCEPTION_H_

src/exceptions/InvalidStateException.h

@@ -0,0 +1,20 @@
+#ifndef MRMC_EXCEPTIONS_INVALIDSTATEEXCEPTION_H_
+#define MRMC_EXCEPTIONS_INVALIDSTATEEXCEPTION_H_
+
+#include "src/exceptions/BaseException.h"
+
+namespace mrmc {
+
+namespace exceptions {
+
+/*! 
+ * @brief This exception is thrown when a memory request can't be
+ * fulfilled.
+ */
+MRMC_EXCEPTION_DEFINE_NEW(InvalidStateException)
+
+} // namespace exceptions
+
+} // namespace mrmc
+
+#endif // MRMC_EXCEPTIONS_INVALIDSTATEEXCEPTION_H_

src/exceptions/NoConvergence.h

@@ -1,56 +0,0 @@
-#ifndef MRMC_EXCEPTIONS_NO_CONVERGENCE_H_
-#define MRMC_EXCEPTIONS_NO_CONVERGENCE_H_
-
-#include <exception>
-
-namespace mrmc {
-namespace exceptions {
-
-//!This exception is thrown when an iterative solver failed to converge with the given maxIterations
-class NoConvergence : public std::exception
-{
- public:
-/* The Visual C++-Version of the exception class has constructors accepting
- * a char*-constant; The GCC version does not have these
- *
- * As the "extended" constructor is used in the sparse matrix code, a dummy
- * constructor is used under linux (which will ignore the parameter)
- */
-#ifdef _WIN32
-   NoConvergence() : exception("::mrmc::NoConvergence"){
-	   iterations = -1;
-	   maxIterations = -1;
-   }
-   NoConvergence(const char * const s, int iterations, int maxIterations): exception(s) {
-	   this->iterations = iterations;
-	   this->maxIterations = maxIterations;
-   }
-#else
-   NoConvergence() : exception() {
-	   iterations = -1;
-	   maxIterations = -1;
-   }
-   NoConvergence(const char * const s, int iterations, int maxIterations): exception() {
-	   this->iterations = iterations;
-	   this->maxIterations = maxIterations;
-   }
-
-#endif
-   virtual const char* what() const throw()
-      {  return "mrmc::NoConvergence";  }
-
-   int getIterationCount() const {
-	   return iterations;
-   }
-   int getMaxIterationCount() const {
-	   return maxIterations;
-   }
- private:
-	 int iterations;
-	 int maxIterations;
-};
-
-} // namespace exceptions
-} // namespace mrmc
-
-#endif // MRMC_EXCEPTIONS_NO_CONVERGENCE_H_

src/exceptions/NoConvergenceException.h

@@ -0,0 +1,17 @@
+#ifndef MRMC_EXCEPTIONS_NOCONVERGENCEEXCEPTION_H_
+#define MRMC_EXCEPTIONS_NOCONVERGENCEEXCEPTION_H_
+
+#include "src/exceptions/BaseException.h"
+
+namespace mrmc {
+namespace exceptions {
+
+/*!
+ * @brief This exception is thrown when an iterative solver failed to converge with the given maxIterations
+ */
+MRMC_EXCEPTION_DEFINE_NEW(NoConvergenceException)
+
+} // namespace exceptions
+} // namespace mrmc
+
+#endif // MRMC_EXCEPTIONS_NOCONVERGENCEEXCEPTION_H_

src/exceptions/OutOfRangeException.h

@@ -0,0 +1,18 @@
+#ifndef MRMC_EXCEPTIONS_OUTOFRANGEEXCEPTION_H_
+#define MRMC_EXCEPTIONS_OUTOFRANGEEXCEPTION_H_
+
+#include "src/exceptions/BaseException.h"
+
+namespace mrmc {
+
+namespace exceptions {
+
+/*
+ * @briefThis exception is thrown when a parameter is not in the range of valid values
+ */
+MRMC_EXCEPTION_DEFINE_NEW(OutOfRangeException)
+
+} // namespace exceptions
+
+} // namespace mrmc
+#endif // MRMC_EXCEPTIONS_OUTOFRANGEEXCEPTION_H_

src/exceptions/WrongFileFormatException.h

@@ -0,0 +1,27 @@
+/*
+ * WrongFileFormatException.h
+ *
+ *  Created on: 16.08.2012
+ *      Author: Thomas Heinemann
+ */
+
+#ifndef MRMC_EXCEPTIONS_WRONGFILEFORMATEXCEPTION_H_
+#define MRMC_EXCEPTIONS_WRONGFILEFORMATEXCEPTION_H_
+
+#include "src/exceptions/BaseException.h"
+
+namespace mrmc {
+
+namespace exceptions {
+
+/*! 
+ * @brief This exception is thrown when an input file
+ * contains invalid or missing keys.
+ */
+MRMC_EXCEPTION_DEFINE_NEW(WrongFileFormatException)
+
+} //namespace exceptions
+
+} //namespace mrmc
+
+#endif /* MRMC_EXCEPTIONS_WRONGFILEFORMATEXCEPTION_H_ */

src/exceptions/file_IO_exception.h

@@ -1,33 +0,0 @@
-/*
- * file_IO_exception.h
- *
- *  Created on: 16.08.2012
- *      Author: Thomas Heinemann
- */
-
-#ifndef MRMC_EXCEPTIONS_FILE_IO_EXCEPTION_H_
-#define MRMC_EXCEPTIONS_FILE_IO_EXCEPTION_H_
-
-namespace mrmc {
-
-namespace exceptions {
-
-class file_IO_exception : public std::exception {
-   public:
-#ifdef _WIN32
-      file_IO_exception() : exception("::mrmc::file_IO_exception"){};
-      file_IO_exception(const char * const s): exception(s) {};
-#else
-      file_IO_exception() {};
-      file_IO_exception(const char * const s): exception() {};
-#endif
-      virtual const char* what() const throw(){
-         {  return "mrmc::file_IO_exception";  }
-      }
-};
-
-}
-
-}
-
-#endif /* MRMC_EXCEPTIONS_FILE_IO_EXCEPTION_H_ */

src/exceptions/invalid_argument.h

@@ -1,34 +0,0 @@
-#ifndef MRMC_EXCEPTIONS_INVALID_ARGUMENT_H_
-#define MRMC_EXCEPTIONS_INVALID_ARGUMENT_H_
-
-#include <exception>
-
-namespace mrmc {
-
-namespace exceptions {
-
-//!This exception is thrown when a parameter is invalid in this context
-class invalid_argument : public std::exception
-{
- public:
-/* The Visual C++-Version of the exception class has constructors accepting
- * a char*-constant; The GCC version does not have these
- *
- * As the "extended" constructor is used in the sparse matrix code, a dummy
- * constructor is used under linux (which will ignore the parameter)
- */
-#ifdef _WIN32
-   invalid_argument() : exception("::mrmc::invalid_argument"){}
-   invalid_argument(const char * const s): exception(s) {}
-#else
-   invalid_argument() : exception() {}
-   invalid_argument(const char * const s): exception() {}
-#endif
-   virtual const char* what() const throw()
-      {  return "mrmc::invalid_argument";  }
-};
-
-} // namespace exceptions
-
-} // namespace mrmc
-#endif // MRMC_EXCEPTIONS_INVALID_ARGUMENT_H_

src/exceptions/invalid_state.h

@@ -1,37 +0,0 @@
-#ifndef MRMC_EXCEPTIONS_INVALID_STATE_H_
-#define MRMC_EXCEPTIONS_INVALID_STATE_H_
-
-#include <exception>
-
-namespace mrmc {
-
-namespace exceptions {
-
-//!This exception is thrown when a memory request can't be
-//!fulfilled.
-class invalid_state : public std::exception
-{
- public:
-/* The Visual C++-Version of the exception class has constructors accepting
- * a char*-constant; The GCC version does not have these
- *
- * As the "extended" constructor is used in the sparse matrix code, a dummy
- * constructor is used under linux (which will ignore the parameter)
- */
-#ifdef _WIN32
-   invalid_state() : exception("::mrmc::invalid_state"){}
-   invalid_state(const char * const s): exception(s) {}
-#else
-   invalid_state() : exception() {}
-   invalid_state(const char * const s): exception() {}
-
-#endif
-   virtual const char* what() const throw()
-      {  return "mrmc::invalid_state";  }
-};
-
-} // namespace exceptions
-
-} // namespace mrmc
-
-#endif // MRMC_EXCEPTIONS_INVALID_STATE_H_

src/exceptions/out_of_range.h

@@ -1,34 +0,0 @@
-#ifndef MRMC_EXCEPTIONS_OUT_OF_RANGE_H_
-#define MRMC_EXCEPTIONS_OUT_OF_RANGE_H_
-
-#include <exception>
-
-namespace mrmc {
-
-namespace exceptions {
-
-//!This exception is thrown when a parameter is not in the range of valid values
-class out_of_range : public std::exception
-{
- public:
-/* The Visual C++-Version of the exception class has constructors accepting
- * a char*-constant; The GCC version does not have these
- *
- * As the "extended" constructor is used in the sparse matrix code, a dummy
- * constructor is used under linux (which will ignore the parameter)
- */
-#ifdef _WIN32
-   out_of_range() : exception("::mrmc::out_of_range"){}
-   out_of_range(const char * const s): exception(s) {}
-#else
-   out_of_range() : exception() {}
-   out_of_range(const char * const s): exception() {}
-#endif
-   virtual const char* what() const throw()
-      {  return "mrmc::out_of_range";  }
-};
-
-} // namespace exceptions
-
-} // namespace mrmc
-#endif // MRMC_EXCEPTIONS_OUT_OF_RANGE_H_

src/exceptions/wrong_file_format.h

@@ -1,35 +0,0 @@
-/*
- * wrong_file_format.h
- *
- *  Created on: 16.08.2012
- *      Author: Thomas Heinemann
- */
-
-#ifndef WRONG_FILE_FORMAT_H_
-#define WRONG_FILE_FORMAT_H_
-
-#include <exception>
-
-namespace mrmc {
-
-namespace exceptions {
-
-class wrong_file_format : public std::exception {
-   public:
-#ifdef _WIN32
-      wrong_file_format() : exception("::mrmc::wrong_file_format"){};
-      wrong_file_format(const char * const s): exception(s) {};
-#else
-      wrong_file_format() {};
-      wrong_file_format(const char * const s): exception() {};
-#endif
-      virtual const char* what() const throw(){
-         {  return "mrmc::wrong_file_format";  }
-      }
-};
-
-} //namespace exceptions
-
-} //namespace mrmc
-
-#endif /* WRONG_FILE_FORMAT_H_ */

src/formula/And.h

@@ -5,10 +5,10 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef AND_H_
-#define AND_H_
+#ifndef MRMC_FORMULA_AND_H_
+#define MRMC_FORMULA_AND_H_
 
-#include "PCTLStateFormula.h"
+#include "PctlStateFormula.h"
 #include <string>
 
 namespace mrmc {
@@ -27,11 +27,11 @@ namespace formula {
  * The subtrees are seen as part of the object and deleted with the object
  * (this behavior can be prevented by setting them to NULL before deletion)
  *
- * @see PCTLStateFormula
- * @see PCTLFormula
+ * @see PctlStateFormula
+ * @see PctlFormula
  */
 template <class T>
-class And : public PCTLStateFormula<T> {
+class And : public PctlStateFormula<T> {
 
 public:
 	/*!
@@ -50,7 +50,7 @@ public:
 	 * @param left The left sub formula
 	 * @param right The right sub formula
 	 */
-	And(PCTLStateFormula<T>* left, PCTLStateFormula<T>* right) {
+	And(PctlStateFormula<T>* left, PctlStateFormula<T>* right) {
 		this->left = left;
 		this->right = right;
 	}
@@ -75,7 +75,7 @@ public:
 	 *
 	 * @param newLeft the new left child.
 	 */
-	void setLeft(PCTLStateFormula<T>* newLeft) {
+	void setLeft(PctlStateFormula<T>* newLeft) {
 		left = newLeft;
 	}
 
@@ -84,21 +84,21 @@ public:
 	 *
 	 * @param newRight the new right child.
 	 */
-	void setRight(PCTLStateFormula<T>* newRight) {
+	void setRight(PctlStateFormula<T>* newRight) {
 		right = newRight;
 	}
 
 	/*!
 	 * @returns a pointer to the left child node
 	 */
-	const PCTLStateFormula<T>& getLeft() const {
+	const PctlStateFormula<T>& getLeft() const {
 		return *left;
 	}
 
 	/*!
 	 * @returns a pointer to the right child node
 	 */
-	const PCTLStateFormula<T>& getRight() const {
+	const PctlStateFormula<T>& getRight() const {
 		return *right;
 	}
 
@@ -121,7 +121,7 @@ public:
 	 *
 	 * @returns a new AND-object that is identical the called object.
 	 */
-	virtual PCTLStateFormula<T>* clone() const {
+	virtual PctlStateFormula<T>* clone() const {
 		And<T>* result = new And();
 		if (this->left != NULL) {
 		  result->setLeft(left->clone());
@@ -146,12 +146,12 @@ public:
 	}
 
 private:
-	PCTLStateFormula<T>* left;
-	PCTLStateFormula<T>* right;
+	PctlStateFormula<T>* left;
+	PctlStateFormula<T>* right;
 };
 
 } //namespace formula
 
 } //namespace mrmc
 
-#endif /* AND_H_ */
+#endif /* MRMC_FORMULA_AND_H_ */

src/formula/AP.h → src/formula/Ap.h

@@ -1,14 +1,14 @@
 /*
- * AP.h
+ * Ap.h
  *
  *  Created on: 19.10.2012
  *      Author: Thomas Heinemann
  */
 
-#ifndef AP_H_
-#define AP_H_
+#ifndef MRMC_FORMULA_AP_H_
+#define MRMC_FORMULA_AP_H_
 
-#include "PCTLStateFormula.h"
+#include "PctlStateFormula.h"
 
 namespace mrmc {
 
@@ -20,21 +20,21 @@ namespace formula {
  *
  * This class represents the leaves in the formula tree.
  *
- * @see PCTLStateFormula
- * @see PCTLFormula
+ * @see PctlStateFormula
+ * @see PctlFormula
  */
 template <class T>
-class AP : public PCTLStateFormula<T> {
+class Ap : public PctlStateFormula<T> {
 
 public:
 	/*!
 	 * Constructor
 	 *
-	 * Creates a new atomic proposition leaf, with the label AP
+	 * Creates a new atomic proposition leaf, with the label Ap
 	 *
 	 * @param ap The string representing the atomic proposition
 	 */
-	AP(std::string ap) {
+	Ap(std::string ap) {
 		this->ap = ap;
 	}
 
@@ -42,12 +42,12 @@ public:
 	 * Destructor.
 	 * At this time, empty...
 	 */
-	virtual ~AP() { }
+	virtual ~Ap() { }
 
 	/*!
 	 * @returns the name of the atomic proposition
 	 */
-	const std::string& getAP() const {
+	const std::string& getAp() const {
 		return ap;
 	}
 
@@ -56,16 +56,16 @@ public:
 	 *
 	 */
 	virtual std::string toString() const {
-		return getAP();
+		return getAp();
 	}
 
 	/*!
 	 * Clones the called object.
 	 *
-	 * @returns a new AP-object that is identical the called object.
+	 * @returns a new Ap-object that is identical the called object.
 	 */
-	virtual PCTLStateFormula<T>* clone() const {
-	  return new AP(ap);
+	virtual PctlStateFormula<T>* clone() const {
+	  return new Ap(ap);
 	}
 
 	/*!
@@ -78,7 +78,7 @@ public:
 	 * @returns A bit vector indicating all states that satisfy the formula represented by the called object.
 	 */
 	virtual mrmc::storage::BitVector *check(const mrmc::modelChecker::DtmcPrctlModelChecker<T>& modelChecker) const {
-	  return modelChecker.checkAP(*this);
+	  return modelChecker.checkAp(*this);
 	}
 
 private:
@@ -89,4 +89,4 @@ private:
 
 } //namespace mrmc
 
-#endif /* AP_H_ */
+#endif /* MRMC_FORMULA_AP_H_ */

src/formula/BoundedUntil.h

@@ -5,11 +5,11 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef BOUNDEDUNTIL_H_
-#define BOUNDEDUNTIL_H_
+#ifndef MRMC_FORMULA_BOUNDEDUNTIL_H_
+#define MRMC_FORMULA_BOUNDEDUNTIL_H_
 
-#include "PCTLPathFormula.h"
-#include "PCTLStateFormula.h"
+#include "PctlPathFormula.h"
+#include "PctlStateFormula.h"
 #include "boost/integer/integer_mask.hpp"
 #include <string>
 
@@ -30,11 +30,11 @@ namespace formula {
  * The subtrees are seen as part of the object and deleted with the object
  * (this behavior can be prevented by setting them to NULL before deletion)
  *
- * @see PCTLPathFormula
- * @see PCTLFormula
+ * @see PctlPathFormula
+ * @see PctlFormula
  */
 template <class T>
-class BoundedUntil : public PCTLPathFormula<T> {
+class BoundedUntil : public PctlPathFormula<T> {
 
 public:
 	/*!
@@ -53,7 +53,7 @@ public:
 	 * @param right The left formula subtree
 	 * @param bound The maximal number of steps
 	 */
-	BoundedUntil(PCTLStateFormula<T>* left, PCTLStateFormula<T>* right,
+	BoundedUntil(PctlStateFormula<T>* left, PctlStateFormula<T>* right,
 					 uint_fast64_t bound) {
 		this->left = left;
 		this->right = right;;
@@ -80,7 +80,7 @@ public:
 	 *
 	 * @param newLeft the new left child.
 	 */
-	void setLeft(PCTLStateFormula<T>* newLeft) {
+	void setLeft(PctlStateFormula<T>* newLeft) {
 		left = newLeft;
 	}
 
@@ -89,21 +89,21 @@ public:
 	 *
 	 * @param newRight the new right child.
 	 */
-	void setRight(PCTLStateFormula<T>* newRight) {
+	void setRight(PctlStateFormula<T>* newRight) {
 		right = newRight;
 	}
 
 	/*!
 	 * @returns a pointer to the left child node
 	 */
-	const PCTLStateFormula<T>& getLeft() const {
+	const PctlStateFormula<T>& getLeft() const {
 		return *left;
 	}
 
 	/*!
 	 * @returns a pointer to the right child node
 	 */
-	const PCTLStateFormula<T>& getRight() const {
+	const PctlStateFormula<T>& getRight() const {
 		return *right;
 	}
 
@@ -144,7 +144,7 @@ public:
 	 *
 	 * @returns a new BoundedUntil-object that is identical the called object.
 	 */
-	virtual PCTLPathFormula<T>* clone() const {
+	virtual PctlPathFormula<T>* clone() const {
 		BoundedUntil<T>* result = new BoundedUntil();
 		result->setBound(bound);
 		if (left != NULL) {
@@ -171,8 +171,8 @@ public:
 	}
 
 private:
-	PCTLStateFormula<T>* left;
-	PCTLStateFormula<T>* right;
+	PctlStateFormula<T>* left;
+	PctlStateFormula<T>* right;
 	uint_fast64_t bound;
 };
 
@@ -180,4 +180,4 @@ private:
 
 } //namespace mrmc
 
-#endif /* BOUNDEDUNTIL_H_ */
+#endif /* MRMC_FORMULA_BOUNDEDUNTIL_H_ */

src/formula/Formulas.h

@@ -5,21 +5,21 @@
  *      Author: chris
  */
 
-#ifndef FORMULAS_H_
-#define FORMULAS_H_
+#ifndef MRMC_FORMULA_FORMULAS_H_
+#define MRMC_FORMULA_FORMULAS_H_
 
 #include "And.h"
-#include "AP.h"
+#include "Ap.h"
 #include "BoundedUntil.h"
 #include "Next.h"
 #include "Not.h"
 #include "Or.h"
-#include "PCTLformula.h"
-#include "PCTLPathFormula.h"
-#include "PCTLStateFormula.h"
+#include "PctlFormula.h"
+#include "PctlPathFormula.h"
+#include "PctlStateFormula.h"
 #include "ProbabilisticOperator.h"
 #include "ProbabilisticNoBoundsOperator.h"
 #include "ProbabilisticIntervalOperator.h"
 #include "Until.h"
 
-#endif /* FORMULAS_H_ */
+#endif /* MRMC_FORMULA_FORMULAS_H_ */

src/formula/Next.h

@@ -5,11 +5,11 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef NEXT_H_
-#define NEXT_H_
+#ifndef MRMC_FORMULA_NEXT_H_
+#define MRMC_FORMULA_NEXT_H_
 
-#include "PCTLPathFormula.h"
-#include "PCTLStateFormula.h"
+#include "PctlPathFormula.h"
+#include "PctlStateFormula.h"
 
 namespace mrmc {
 
@@ -27,11 +27,11 @@ namespace formula {
  * The subtree is seen as part of the object and deleted with the object
  * (this behavior can be prevented by setting them to NULL before deletion)
  *
- * @see PCTLPathFormula
- * @see PCTLFormula
+ * @see PctlPathFormula
+ * @see PctlFormula
  */
 template <class T>
-class Next : public PCTLPathFormula<T> {
+class Next : public PctlPathFormula<T> {
 
 public:
 	/*!
@@ -46,7 +46,7 @@ public:
 	 *
 	 * @param child The child node
 	 */
-	Next(PCTLStateFormula<T>* child) {
+	Next(PctlStateFormula<T>* child) {
 		this->child = child;
 	}
 
@@ -65,7 +65,7 @@ public:
 	/*!
 	 * @returns the child node
 	 */
-	const PCTLStateFormula<T>& getChild() const {
+	const PctlStateFormula<T>& getChild() const {
 		return *child;
 	}
 
@@ -73,7 +73,7 @@ public:
 	 * Sets the subtree
 	 * @param child the new child node
 	 */
-	void setChild(PCTLStateFormula<T>* child) {
+	void setChild(PctlStateFormula<T>* child) {
 		this->child = child;
 	}
 
@@ -95,7 +95,7 @@ public:
 	 *
 	 * @returns a new BoundedUntil-object that is identical the called object.
 	 */
-	virtual PCTLPathFormula<T>* clone() const {
+	virtual PctlPathFormula<T>* clone() const {
 		Next<T>* result = new Next<T>();
 		if (child != NULL) {
 			result->setChild(child);
@@ -117,11 +117,11 @@ public:
 	}
 
 private:
-	PCTLStateFormula<T>* child;
+	PctlStateFormula<T>* child;
 };
 
 } //namespace formula
 
 } //namespace mrmc
 
-#endif /* NEXT_H_ */
+#endif /* MRMC_FORMULA_NEXT_H_ */

src/formula/Not.h

@@ -5,10 +5,10 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef NOT_H_
-#define NOT_H_
+#ifndef MRMC_FORMULA_NOT_H_
+#define MRMC_FORMULA_NOT_H_
 
-#include "PCTLStateFormula.h"
+#include "PctlStateFormula.h"
 
 namespace mrmc {
 
@@ -23,11 +23,11 @@ namespace formula {
  * The subtree is seen as part of the object and deleted with the object
  * (this behavior can be prevented by setting them to NULL before deletion)
  *
- * @see PCTLStateFormula
- * @see PCTLFormula
+ * @see PctlStateFormula
+ * @see PctlFormula
  */
 template <class T>
-class Not : public PCTLStateFormula<T> {
+class Not : public PctlStateFormula<T> {
 
 public:
 	/*!
@@ -41,7 +41,7 @@ public:
 	 * Constructor
 	 * @param child The child node
 	 */
-	Not(PCTLStateFormula<T>* child) {
+	Not(PctlStateFormula<T>* child) {
 		this->child = child;
 	}
 
@@ -60,7 +60,7 @@ public:
 	/*!
 	 * @returns The child node
 	 */
-	const PCTLStateFormula<T>& getChild() const {
+	const PctlStateFormula<T>& getChild() const {
 		return *child;
 	}
 
@@ -68,7 +68,7 @@ public:
 	 * Sets the subtree
 	 * @param child the new child node
 	 */
-	void setChild(PCTLStateFormula<T>* child) {
+	void setChild(PctlStateFormula<T>* child) {
 		this->child = child;
 	}
 
@@ -88,7 +88,7 @@ public:
 	 *
 	 * @returns a new AND-object that is identical the called object.
 	 */
-	virtual PCTLStateFormula<T>* clone() const {
+	virtual PctlStateFormula<T>* clone() const {
 		Not<T>* result = new Not<T>();
 		if (child != NULL) {
 			result->setChild(child);
@@ -110,11 +110,11 @@ public:
 	}
 
 private:
-	PCTLStateFormula<T>* child;
+	PctlStateFormula<T>* child;
 };
 
 } //namespace formula
 
 } //namespace MRMC
 
-#endif /* NOT_H_ */
+#endif /* MRMC_FORMULA_NOT_H_ */

src/formula/Or.h

@@ -5,10 +5,10 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef OR_H_
-#define OR_H_
+#ifndef MRMC_FORMULA_OR_H_
+#define MRMC_FORMULA_OR_H_
 
-#include "PCTLStateFormula.h"
+#include "PctlStateFormula.h"
 
 namespace mrmc {
 
@@ -26,11 +26,11 @@ namespace formula {
  * The subtrees are seen as part of the object and deleted with the object
  * (this behavior can be prevented by setting them to NULL before deletion)
  *
- * @see PCTLStateFormula
- * @see PCTLFormula
+ * @see PctlStateFormula
+ * @see PctlFormula
  */
 template <class T>
-class Or : public PCTLStateFormula<T> {
+class Or : public PctlStateFormula<T> {
 
 public:
 	/*!
@@ -49,7 +49,7 @@ public:
 	 * @param left The left sub formula
 	 * @param right The right sub formula
 	 */
-	Or(PCTLStateFormula<T>* left, PCTLStateFormula<T>* right) {
+	Or(PctlStateFormula<T>* left, PctlStateFormula<T>* right) {
 		this->left = left;
 		this->right = right;
 	}
@@ -74,7 +74,7 @@ public:
 	 *
 	 * @param newLeft the new left child.
 	 */
-	void setLeft(PCTLStateFormula<T>* newLeft) {
+	void setLeft(PctlStateFormula<T>* newLeft) {
 		left = newLeft;
 	}
 
@@ -83,21 +83,21 @@ public:
 	 *
 	 * @param newRight the new right child.
 	 */
-	void setRight(PCTLStateFormula<T>* newRight) {
+	void setRight(PctlStateFormula<T>* newRight) {
 		right = newRight;
 	}
 
 	/*!
 	 * @returns a pointer to the left child node
 	 */
-	const PCTLStateFormula<T>& getLeft() const {
+	const PctlStateFormula<T>& getLeft() const {
 		return *left;
 	}
 
 	/*!
 	 * @returns a pointer to the right child node
 	 */
-	const PCTLStateFormula<T>& getRight() const {
+	const PctlStateFormula<T>& getRight() const {
 		return *right;
 	}
 
@@ -120,7 +120,7 @@ public:
 	 *
 	 * @returns a new AND-object that is identical the called object.
 	 */
-	virtual PCTLStateFormula<T>* clone() const {
+	virtual PctlStateFormula<T>* clone() const {
 		Or<T>* result = new Or();
 		if (this->left != NULL) {
 		  result->setLeft(left->clone());
@@ -145,12 +145,12 @@ public:
 	}
 
 private:
-	PCTLStateFormula<T>* left;
-	PCTLStateFormula<T>* right;
+	PctlStateFormula<T>* left;
+	PctlStateFormula<T>* right;
 };
 
 } //namespace formula
 
 } //namespace mrmc
 
-#endif /* OR_H_ */
+#endif /* MRMC_FORMULA_OR_H_ */

src/formula/PCTLformula.h → src/formula/PctlFormula.h

@@ -1,12 +1,12 @@
 /*
- * PCTLformula.h
+ * Pctlformula.h
  *
  *  Created on: 19.10.2012
  *      Author: Thomas Heinemann
  */
 
-#ifndef PCTLFORMULA_H_
-#define PCTLFORMULA_H_
+#ifndef MRMC_FORMULA_PCTLFORMULA_H_
+#define MRMC_FORMULA_PCTLFORMULA_H_
 
 #include <string>
 
@@ -23,16 +23,16 @@ namespace formula {
  * @attention This class is abstract.
  * @note Formula classes do not have copy constructors. The parameters of the constructors are usually the subtrees, so
  * 	   the syntax conflicts with copy constructors for unary operators. To produce an identical object, the classes
- * 	   PCTLPathFormula and PCTLStateFormula offer the method clone().
+ * 	   PctlPathFormula and PctlStateFormula offer the method clone().
  */
 template <class T>
-class PCTLFormula {
+class PctlFormula {
 
 public:
 	/*!
 	 * virtual destructor
 	 */
-	virtual ~PCTLFormula() { }
+	virtual ~PctlFormula() { }
 
 	/*!
 	 * @note This function is not implemented in this class.
@@ -45,4 +45,4 @@ public:
 
 } //namespace mrmc
 
-#endif /* PCTLFORMULA_H_ */
+#endif /* MRMC_FORMULA_PCTLFORMULA_H_ */

src/formula/PCTLPathFormula.h → src/formula/PctlPathFormula.h

@@ -1,14 +1,14 @@
 /*
- * PCTLPathFormula.h
+ * PctlPathFormula.h
  *
  *  Created on: 19.10.2012
  *      Author: Thomas Heinemann
  */
 
-#ifndef PCTLPATHFORMULA_H_
-#define PCTLPATHFORMULA_H_
+#ifndef MRMC_FORMULA_PCTLPATHFORMULA_H_
+#define MRMC_FORMULA_PCTLPATHFORMULA_H_
 
-#include "PCTLformula.h"
+#include "PctlFormula.h"
 #include "modelChecker/DtmcPrctlModelChecker.h"
 #include <vector>
 
@@ -26,13 +26,13 @@ namespace formula {
  * 	   clone().
  */
 template <class T>
-class PCTLPathFormula : public PCTLFormula<T> {
+class PctlPathFormula : public PctlFormula<T> {
 
 public:
 	/*!
 	 * empty destructor
 	 */
-	virtual ~PCTLPathFormula() { }
+	virtual ~PctlPathFormula() { }
 
 	/*!
 	 * Clones the called object.
@@ -42,7 +42,7 @@ public:
 	 * @note This function is not implemented in this class.
 	 * @returns a new AND-object that is identical the called object.
 	 */
-	virtual PCTLPathFormula<T>* clone() const = 0;
+	virtual PctlPathFormula<T>* clone() const = 0;
 
 	/*!
 	 * Calls the model checker to check this formula.
@@ -62,4 +62,4 @@ public:
 
 } //namespace mrmc
 
-#endif /* PCTLPATHFORMULA_H_ */
+#endif /* MRMC_FORMULA_PCTLPATHFORMULA_H_ */

src/formula/PCTLStateFormula.h → src/formula/PctlStateFormula.h

@@ -1,14 +1,14 @@
 /*
- * PCTLStateFormula.h
+ * PctlStateFormula.h
  *
  *  Created on: 19.10.2012
  *      Author: Thomas Heinemann
  */
 
-#ifndef PCTLSTATEFORMULA_H_
-#define PCTLSTATEFORMULA_H_
+#ifndef MRMC_FORMULA_PCTLSTATEFORMULA_H_
+#define MRMC_FORMULA_PCTLSTATEFORMULA_H_
 
-#include "PCTLformula.h"
+#include "PctlFormula.h"
 #include "storage/BitVector.h"
 #include "modelChecker/DtmcPrctlModelChecker.h"
 
@@ -26,13 +26,13 @@ namespace formula {
  * 	   clone().
  */
 template <class T>
-class PCTLStateFormula : public PCTLFormula<T> {
+class PctlStateFormula : public PctlFormula<T> {
 
 public:
 	/*!
 	 * empty destructor
 	 */
-	virtual ~PCTLStateFormula() { }
+	virtual ~PctlStateFormula() { }
 
 	/*!
 	 * Clones the called object.
@@ -42,7 +42,7 @@ public:
 	 * @note This function is not implemented in this class.
 	 * @returns a new AND-object that is identical the called object.
 	 */
-	virtual PCTLStateFormula<T>* clone() const = 0;
+	virtual PctlStateFormula<T>* clone() const = 0;
 
 	/*!
 	 * Calls the model checker to check this formula.
@@ -63,4 +63,4 @@ public:
 } //namespace mrmc
 
 
-#endif /* PCTLSTATEFORMULA_H_ */
+#endif /* MRMC_FORMULA_PCTLSTATEFORMULA_H_ */

src/formula/ProbabilisticIntervalOperator.h

@@ -5,12 +5,12 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef PROBABILISTICINTERVALOPERATOR_H_
-#define PROBABILISTICINTERVALOPERATOR_H_
+#ifndef MRMC_FORMULA_PROBABILISTICINTERVALOPERATOR_H_
+#define MRMC_FORMULA_PROBABILISTICINTERVALOPERATOR_H_
 
-#include "PCTLStateFormula.h"
-#include "PCTLPathFormula.h"
-#include "utility/const_templates.h"
+#include "PctlStateFormula.h"
+#include "PctlPathFormula.h"
+#include "utility/ConstTemplates.h"
 
 namespace mrmc {
 
@@ -35,14 +35,14 @@ namespace formula {
  * (this behavior can be prevented by setting them to NULL before deletion)
  *
  *
- * @see PCTLStateFormula
- * @see PCTLPathFormula
+ * @see PctlStateFormula
+ * @see PctlPathFormula
  * @see ProbabilisticOperator
  * @see ProbabilisticNoBoundsOperator
- * @see PCTLFormula
+ * @see PctlFormula
  */
 template<class T>
-class ProbabilisticIntervalOperator : public PCTLStateFormula<T> {
+class ProbabilisticIntervalOperator : public PctlStateFormula<T> {
 
 public:
 	/*!
@@ -61,7 +61,7 @@ public:
 	 * @param upperBound The upper bound for the probability
 	 * @param pathFormula The child node
 	 */
-	ProbabilisticIntervalOperator(T lowerBound, T upperBound, PCTLPathFormula<T>& pathFormula) {
+	ProbabilisticIntervalOperator(T lowerBound, T upperBound, PctlPathFormula<T>& pathFormula) {
 		this->lower = lowerBound;
 		this->upper = upperBound;
 		this->pathFormula = &pathFormula;
@@ -82,7 +82,7 @@ public:
 	/*!
 	 * @returns the child node (representation of a PCTL path formula)
 	 */
-	const PCTLPathFormula<T>& getPathFormula () const {
+	const PctlPathFormula<T>& getPathFormula () const {
 		return *pathFormula;
 	}
 
@@ -105,7 +105,7 @@ public:
 	 *
 	 * @param pathFormula the path formula that becomes the new child node
 	 */
-	void setPathFormula(PCTLPathFormula<T>* pathFormula) {
+	void setPathFormula(PctlPathFormula<T>* pathFormula) {
 		this->pathFormula = pathFormula;
 	}
 
@@ -141,7 +141,7 @@ public:
 	 *
 	 * @returns a new AND-object that is identical the called object.
 	 */
-	virtual PCTLStateFormula<T>* clone() const {
+	virtual PctlStateFormula<T>* clone() const {
 		ProbabilisticIntervalOperator<T>* result = new ProbabilisticIntervalOperator<T>();
 		result->setInterval(lower, upper);
 		if (pathFormula != NULL) {
@@ -166,11 +166,11 @@ public:
 private:
 	T lower;
 	T upper;
-	PCTLPathFormula<T>* pathFormula;
+	PctlPathFormula<T>* pathFormula;
 };
 
 } //namespace formula
 
 } //namespace mrmc
 
-#endif /* PROBABILISTICINTERVALOPERATOR_H_ */
+#endif /* MRMC_FORMULA_PROBABILISTICINTERVALOPERATOR_H_ */

src/formula/ProbabilisticNoBoundsOperator.h

@@ -5,11 +5,11 @@
  *      Author: thomas
  */
 
-#ifndef PROBABILISTICNOBOUNDSOPERATOR_H_
-#define PROBABILISTICNOBOUNDSOPERATOR_H_
+#ifndef MRMC_FORMULA_PROBABILISTICNOBOUNDSOPERATOR_H_
+#define MRMC_FORMULA_PROBABILISTICNOBOUNDSOPERATOR_H_
 
-#include "PCTLformula.h"
-#include "PCTLPathFormula.h"
+#include "PctlFormula.h"
+#include "PctlPathFormula.h"
 
 namespace mrmc {
 namespace formula {
@@ -26,20 +26,20 @@ namespace formula {
  *
  * @note
  * 	This class is a hybrid of a state and path formula, and may only appear as the outermost operator.
- * 	Hence, it is seen as neither a state nor a path formula, but is directly derived from PCTLformula.
+ * 	Hence, it is seen as neither a state nor a path formula, but is directly derived from PctlFormula.
  *
  * The subtree is seen as part of the object and deleted with it
  * (this behavior can be prevented by setting them to NULL before deletion)
  *
  *
- * @see PCTLStateFormula
- * @see PCTLPathFormula
+ * @see PctlStateFormula
+ * @see PctlPathFormula
  * @see ProbabilisticOperator
  * @see ProbabilisticIntervalOperator
- * @see PCTLFormula
+ * @see PctlFormula
  */
 template <class T>
-class ProbabilisticNoBoundsOperator: public mrmc::formula::PCTLFormula<T> {
+class ProbabilisticNoBoundsOperator: public mrmc::formula::PctlFormula<T> {
 public:
 	/*!
 	 * Empty constructor
@@ -54,7 +54,7 @@ public:
 	 *
 	 * @param pathFormula The child node.
 	 */
-	ProbabilisticNoBoundsOperator(PCTLPathFormula<T> &pathFormula) {
+	ProbabilisticNoBoundsOperator(PctlPathFormula<T> &pathFormula) {
 		this->pathFormula = &pathFormula;
 	}
 
@@ -68,7 +68,7 @@ public:
 	/*!
 	 * @returns the child node (representation of a PCTL path formula)
 	 */
-	const PCTLPathFormula<T>& getPathFormula () const {
+	const PctlPathFormula<T>& getPathFormula () const {
 		return *pathFormula;
 	}
 
@@ -77,7 +77,7 @@ public:
 	 *
 	 * @param pathFormula the path formula that becomes the new child node
 	 */
-	void setPathFormula(PCTLPathFormula<T>* pathFormula) {
+	void setPathFormula(PctlPathFormula<T>* pathFormula) {
 		this->pathFormula = pathFormula;
 	}
 
@@ -92,9 +92,10 @@ public:
 	}
 
 private:
-	PCTLPathFormula<T>* pathFormula;
+	PctlPathFormula<T>* pathFormula;
 };
 
 } /* namespace formula */
 } /* namespace mrmc */
-#endif /* PROBABILISTICNOBOUNDSOPERATOR_H_ */
+
+#endif /* MRMC_FORMULA_PROBABILISTICNOBOUNDSOPERATOR_H_ */

src/formula/ProbabilisticOperator.h

@@ -5,10 +5,10 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef PROBABILISTICOPERATOR_H_
-#define PROBABILISTICOPERATOR_H_
+#ifndef MRMC_FORMULA_PROBABILISTICOPERATOR_H_
+#define MRMC_FORMULA_PROBABILISTICOPERATOR_H_
 
-#include "PCTLStateFormula.h"
+#include "PctlStateFormula.h"
 
 namespace mrmc {
 namespace formula {
@@ -32,14 +32,14 @@ namespace formula {
  * (this behavior can be prevented by setting them to NULL before deletion)
  *
  *
- * @see PCTLStateFormula
- * @see PCTLPathFormula
+ * @see PctlStateFormula
+ * @see PctlPathFormula
  * @see ProbabilisticIntervalOperator
  * @see ProbabilisticNoBoundsOperator
- * @see PCTLFormula
+ * @see PctlFormula
  */
 template<class T>
-class ProbabilisticOperator : public mrmc::formula::PCTLStateFormula<T> {
+class ProbabilisticOperator : public mrmc::formula::PctlStateFormula<T> {
 public:
 	/*!
 	 * Empty constructor
@@ -55,7 +55,7 @@ public:
 	 * @param bound The expected value for path formulas
 	 * @param pathFormula The child node
 	 */
-	ProbabilisticOperator(T bound, PCTLPathFormula<T>& pathFormula) {
+	ProbabilisticOperator(T bound, PctlPathFormula<T>& pathFormula) {
 		this->bound = bound;
 		this->pathFormula = &pathFormula;
 	}
@@ -73,7 +73,7 @@ public:
 	/*!
 	 * @returns the child node (representation of a PCTL path formula)
 	 */
-	const PCTLPathFormula<T>& getPathFormula () const {
+	const PctlPathFormula<T>& getPathFormula () const {
 		return *pathFormula;
 	}
 
@@ -89,7 +89,7 @@ public:
 	 *
 	 * @param pathFormula the path formula that becomes the new child node
 	 */
-	void setPathFormula(PCTLPathFormula<T>* pathFormula) {
+	void setPathFormula(PctlPathFormula<T>* pathFormula) {
 		this->pathFormula = pathFormula;
 	}
 
@@ -109,7 +109,7 @@ public:
 	 *
 	 * @returns a new ProbabilisticOperator-object that is identical to the called object.
 	 */
-	virtual PCTLStateFormula<T>* clone() const {
+	virtual PctlStateFormula<T>* clone() const {
 		ProbabilisticOperator<T>* result = new ProbabilisticOperator<T>();
 		result->setBound(bound);
 		if (pathFormula != NULL) {
@@ -134,9 +134,9 @@ public:
 	}
 
 	/*!
-	 *	Returns a string representation of this PCTLStateFormula
+	 *	Returns a string representation of this PctlStateFormula
 	 * 
-	 * @returns a string representation of this PCTLStateFormula
+	 * @returns a string representation of this PctlStateFormula
 	 */
 	virtual std::string toString() const {
 		std::string result = " P=";
@@ -148,9 +148,10 @@ public:
 	}
 private:
 	T bound;
-	PCTLPathFormula<T>* pathFormula;
+	PctlPathFormula<T>* pathFormula;
 };
 
 } /* namespace formula */
 } /* namespace mrmc */
-#endif /* PROBABILISTICOPERATOR_H_ */
+
+#endif /* MRMC_FORMULA_PROBABILISTICOPERATOR_H_ */

src/formula/Until.h

@@ -5,11 +5,11 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef UNTIL_H_
-#define UNTIL_H_
+#ifndef MRMC_FORMULA_UNTIL_H_
+#define MRMC_FORMULA_UNTIL_H_
 
-#include "PCTLPathFormula.h"
-#include "PCTLStateFormula.h"
+#include "PctlPathFormula.h"
+#include "PctlStateFormula.h"
 
 namespace mrmc {
 
@@ -28,11 +28,11 @@ namespace formula {
  * The subtrees are seen as part of the object and deleted with the object
  * (this behavior can be prevented by setting them to NULL before deletion)
  *
- * @see PCTLPathFormula
- * @see PCTLFormula
+ * @see PctlPathFormula
+ * @see PctlFormula
  */
 template <class T>
-class Until : public PCTLPathFormula<T> {
+class Until : public PctlPathFormula<T> {
 
 public:
 	/*!
@@ -49,7 +49,7 @@ public:
 	 * @param left The left formula subtree
 	 * @param right The left formula subtree
 	 */
-	Until(PCTLStateFormula<T>* left, PCTLStateFormula<T>* right) {
+	Until(PctlStateFormula<T>* left, PctlStateFormula<T>* right) {
 		this->left = left;
 		this->right = right;
 	}
@@ -74,7 +74,7 @@ public:
 	 *
 	 * @param newLeft the new left child.
 	 */
-	void setLeft(PCTLStateFormula<T>* newLeft) {
+	void setLeft(PctlStateFormula<T>* newLeft) {
 		left = newLeft;
 	}
 
@@ -83,21 +83,21 @@ public:
 	 *
 	 * @param newRight the new right child.
 	 */
-	void setRight(PCTLStateFormula<T>* newRight) {
+	void setRight(PctlStateFormula<T>* newRight) {
 		right = newRight;
 	}
 
 	/*!
 	 * @returns a pointer to the left child node
 	 */
-	const PCTLStateFormula<T>& getLeft() const {
+	const PctlStateFormula<T>& getLeft() const {
 		return *left;
 	}
 
 	/*!
 	 * @returns a pointer to the right child node
 	 */
-	const PCTLStateFormula<T>& getRight() const {
+	const PctlStateFormula<T>& getRight() const {
 		return *right;
 	}
 
@@ -120,7 +120,7 @@ public:
 	 *
 	 * @returns a new BoundedUntil-object that is identical the called object.
 	 */
-	virtual PCTLPathFormula<T>* clone() const {
+	virtual PctlPathFormula<T>* clone() const {
 		Until<T>* result = new Until();
 		if (left != NULL) {
 			result->setLeft(left->clone());
@@ -145,12 +145,12 @@ public:
 	}
 
 private:
-	PCTLStateFormula<T>* left;
-	PCTLStateFormula<T>* right;
+	PctlStateFormula<T>* left;
+	PctlStateFormula<T>* right;
 };
 
 } //namespace formula
 
 } //namespace mrmc
 
-#endif /* UNTIL_H_ */
+#endif /* MRMC_FORMULA_UNTIL_H_ */

src/modelChecker/DtmcPrctlModelChecker.h

@@ -5,8 +5,8 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef DTMCPRCTLMODELCHECKER_H_
-#define DTMCPRCTLMODELCHECKER_H_
+#ifndef MRMC_MODELCHECKER_DTMCPRCTLMODELCHECKER_H_
+#define MRMC_MODELCHECKER_DTMCPRCTLMODELCHECKER_H_
 
 namespace mrmc {
 
@@ -23,8 +23,8 @@ class DtmcPrctlModelChecker;
 
 }
 
-#include "src/formula/PCTLPathFormula.h"
-#include "src/formula/PCTLStateFormula.h"
+#include "src/formula/PctlPathFormula.h"
+#include "src/formula/PctlStateFormula.h"
 
 #include "src/formula/Formulas.h"
 
@@ -96,7 +96,7 @@ public:
 	 * @param formula The state formula to check
 	 * @returns The set of states satisfying the formula, represented by a bit vector
 	 */
-	mrmc::storage::BitVector* checkStateFormula(const mrmc::formula::PCTLStateFormula<Type>& formula) const {
+	mrmc::storage::BitVector* checkStateFormula(const mrmc::formula::PctlStateFormula<Type>& formula) const {
 		return formula.check(*this);
 	}
 
@@ -117,16 +117,16 @@ public:
 	/*!
 	 * The check method for a formula with an AP node as root in its formula tree
 	 *
-	 * @param formula The AP state formula to check
+	 * @param formula The Ap state formula to check
 	 * @returns The set of states satisfying the formula, represented by a bit vector
 	 */
-	mrmc::storage::BitVector* checkAP(const mrmc::formula::AP<Type>& formula) const {
-		if (formula.getAP().compare("true") == 0) {
+	mrmc::storage::BitVector* checkAp(const mrmc::formula::Ap<Type>& formula) const {
+		if (formula.getAp().compare("true") == 0) {
 			return new mrmc::storage::BitVector(model->getNumberOfStates(), 1);
-		} else if (formula.getAP().compare("false") == 0) {
+		} else if (formula.getAp().compare("false") == 0) {
 			return new mrmc::storage::BitVector(model->getNumberOfStates());
 		}
-		return new mrmc::storage::BitVector(*model->getLabeledStates(formula.getAP()));
+		return new mrmc::storage::BitVector(*model->getLabeledStates(formula.getAp()));
 	}
 
 	/*!
@@ -226,7 +226,7 @@ public:
 	 * @param formula The path formula to check
 	 * @returns for each state the probability that the path formula holds.
 	 */
-	std::vector<Type>* checkPathFormula(const mrmc::formula::PCTLPathFormula<Type>& formula) const {
+	std::vector<Type>* checkPathFormula(const mrmc::formula::PctlPathFormula<Type>& formula) const {
 		return formula.check(*this);
 	}
 
@@ -262,4 +262,4 @@ private:
 
 } //namespace mrmc
 
-#endif /* DTMCPRCTLMODELCHECKER_H_ */
+#endif /* MRMC_MODELCHECKER_DTMCPRCTLMODELCHECKER_H_ */

src/modelChecker/EigenDtmcPrctlModelChecker.h

@@ -5,16 +5,16 @@
  *      Author: 
  */
 
-#ifndef EIGENDTMCPRCTLMODELCHECKER_H_
-#define EIGENDTMCPRCTLMODELCHECKER_H_
+#ifndef MRMC_MODELCHECKER_EIGENDTMCPRCTLMODELCHECKER_H_
+#define MRMC_MODELCHECKER_EIGENDTMCPRCTLMODELCHECKER_H_
 
-#include "src/utility/vector.h"
+#include "src/utility/Vector.h"
 
 #include "src/models/Dtmc.h"
 #include "src/modelChecker/DtmcPrctlModelChecker.h"
 #include "src/solver/GraphAnalyzer.h"
-#include "src/utility/const_templates.h"
-#include "src/exceptions/NoConvergence.h"
+#include "src/utility/ConstTemplates.h"
+#include "src/exceptions/NoConvergenceException.h"
 
 #include "Eigen/Sparse"
 #include "Eigen/src/IterativeLinearSolvers/BiCGSTAB.h"
@@ -197,7 +197,7 @@ public:
 				LOG4CPLUS_ERROR(logger, "Solving of Submatrix failed: InvalidInput");
 			} else if(solver.info() == Eigen::ComputationInfo::NoConvergence) {
 				// NoConvergence
-				throw mrmc::exceptions::NoConvergence("Solving of Submatrix with Eigen failed", solver.iterations(), solver.maxIterations());
+				throw mrmc::exceptions::NoConvergenceException("Solving of Submatrix with Eigen failed", solver.iterations(), solver.maxIterations());
 			} else if(solver.info() == Eigen::ComputationInfo::NumericalIssue) {
 				// NumericalIssue
 				LOG4CPLUS_ERROR(logger, "Solving of Submatrix failed: NumericalIssue");
@@ -226,4 +226,4 @@ public:
 
 } //namespace mrmc
 
-#endif /* EIGENDTMCPRCTLMODELCHECKER_H_ */
+#endif /* MRMC_MODELCHECKER_EIGENDTMCPRCTLMODELCHECKER_H_ */

src/modelChecker/GmmxxDtmcPrctlModelChecker.h

@@ -5,17 +5,17 @@
  *      Author: Christian Dehnert
  */
 
-#ifndef GMMXXDTMCPRCTLMODELCHECKER_H_
-#define GMMXXDTMCPRCTLMODELCHECKER_H_
+#ifndef MRMC_MODELCHECKER_GMMXXDTMCPRCTLMODELCHECKER_H_
+#define MRMC_MODELCHECKER_GMMXXDTMCPRCTLMODELCHECKER_H_
 
 #include <cmath>
 
 #include "src/models/Dtmc.h"
 #include "src/modelChecker/DtmcPrctlModelChecker.h"
 #include "src/solver/GraphAnalyzer.h"
-#include "src/utility/vector.h"
+#include "src/utility/Vector.h"
 
-#include "src/utility/settings.h"
+#include "src/utility/Settings.h"
 
 #include "gmm/gmm_matrix.h"
 #include "gmm/gmm_iter_solvers.h"
@@ -250,7 +250,7 @@ public:
 	 */
 	static void validateLeMethod(const std::string& lemethod) {
 		if (lemethod.compare("bicgstab") != 0 && lemethod.compare("qmr") != 0) {
-			throw exceptions::InvalidSettings() << "Argument " << lemethod << " for option 'lemethod' is invalid.";
+			throw exceptions::InvalidSettingsException() << "Argument " << lemethod << " for option 'lemethod' is invalid.";
 		}
 	}
 
@@ -260,7 +260,7 @@ public:
 	 */
 	static void validatePreconditioner(const std::string& preconditioner) {
 		if (preconditioner.compare("ilu") != 0 && preconditioner.compare("diagonal") != 0 && preconditioner.compare("ildlt") && preconditioner.compare("none") != 0) {
-			throw exceptions::InvalidSettings() << "Argument " << preconditioner << " for option 'precond' is invalid.";
+			throw exceptions::InvalidSettingsException() << "Argument " << preconditioner << " for option 'precond' is invalid.";
 		}
 	}
 };
@@ -269,4 +269,4 @@ public:
 
 } //namespace mrmc
 
-#endif /* GMMXXDTMCPRCTLMODELCHECKER_H_ */
+#endif /* MRMC_MODELCHECKER_GMMXXDTMCPRCTLMODELCHECKER_H_ */

src/models/AtomicPropositionsLabeling.h

@@ -1,14 +1,15 @@
 /*
- * labeling.h
+ * AtomicPropositionsLabeling.h
  *
  *  Created on: 10.09.2012
  *      Author: Thomas Heinemann
  */
 
-#ifndef MRMC_MODELS_ATOMIC_PROPOSITIONS_LABELING_H_
-#define MRMC_MODELS_ATOMIC_PROPOSITIONS_LABELING_H_
+#ifndef MRMC_MODELS_ATOMICPROPOSITIONSLABELING_H_
+#define MRMC_MODELS_ATOMICPROPOSITIONSLABELING_H_
 
 #include "src/storage/BitVector.h"
+#include "src/exceptions/OutOfRangeException.h"
 #include <ostream>
 #include <stdexcept>
 #include <unordered_map>
@@ -81,10 +82,10 @@ public:
 	 */
 	uint_fast64_t addAtomicProposition(std::string ap) {
 		if (nameToLabelingMap.count(ap) != 0) {
-			throw std::out_of_range("Atomic Proposition already exists.");
+			throw mrmc::exceptions::OutOfRangeException("Atomic Proposition already exists.");
 		}
 		if (apsCurrent >= apCountMax) {
-			throw std::out_of_range("Added more atomic propositions than"
+			throw mrmc::exceptions::OutOfRangeException("Added more atomic propositions than"
 					"previously declared.");
 		}
 		nameToLabelingMap[ap] = apsCurrent;
@@ -109,10 +110,10 @@ public:
 	 */
 	void addAtomicPropositionToState(std::string ap, const uint_fast64_t state) {
 		if (nameToLabelingMap.count(ap) == 0) {
-			throw std::out_of_range("Atomic Proposition '" + ap + "' unknown.");
+			throw mrmc::exceptions::OutOfRangeException() << "Atomic Proposition '" << ap << "' unknown.";
 		}
 		if (state >= stateCount) {
-			throw std::out_of_range("State index out of range.");
+			throw mrmc::exceptions::OutOfRangeException("State index out of range.");
 		}
 		this->singleLabelings[nameToLabelingMap[ap]]->set(state, true);
 	}
@@ -124,7 +125,7 @@ public:
 	 */
 	std::set<std::string> getPropositionsForState(uint_fast64_t state) {
 		if (state >= stateCount) {
-			throw std::out_of_range("State index out of range.");
+			throw mrmc::exceptions::OutOfRangeException("State index out of range.");
 		}
 		std::set<std::string> result;
 		for (auto it = nameToLabelingMap.begin();
@@ -228,4 +229,4 @@ private:
 
 } // namespace mrmc
 
-#endif /* MRMC_MODELS_ATOMIC_PROPOSITIONS_LABELING_H_ */
+#endif /* MRMC_MODELS_ATOMICPROPOSITIONSLABELING_H_ */

src/models/Dtmc.h

@@ -1,12 +1,12 @@
 /*
- * dtmc.h
+ * Dtmc.h
  *
  *  Created on: 14.11.2012
  *      Author: Christian Dehnert
  */
 
-#ifndef DTMC_H_
-#define DTMC_H_
+#ifndef MRMC_MODELS_DTMC_H_
+#define MRMC_MODELS_DTMC_H_
 
 #include <ostream>
 #include <memory>
@@ -155,4 +155,4 @@ private:
 
 } // namespace mrmc
 
-#endif /* DTMC_H_ */
+#endif /* MRMC_MODELS_DTMC_H_ */

src/models/GraphTransitions.h

@@ -1,12 +1,12 @@
 /*
- * backward_transitions.h
+ * GraphTransitions.h
  *
  *  Created on: 17.11.2012
  *      Author: Christian Dehnert
  */
 
-#ifndef GRAPHTRANSITIONS_H_
-#define BACKWARDTRANSITIONS_H_
+#ifndef MRMC_MODELS_GRAPHTRANSITIONS_H_
+#define MRMC_MODELS_GRAPHTRANSITIONS_H_
 
 #include "src/storage/SquareSparseMatrix.h"
 
@@ -175,4 +175,4 @@ private:
 
 } // namespace mrmc
 
-#endif /* GRAPHTRANSITIONS_H_ */
+#endif /* MRMC_MODELS_GRAPHTRANSITIONS_H_ */

src/mrmc.cpp

@@ -12,7 +12,7 @@
  *  Description: Central part of the application containing the main() Method
  */
 
-#include "src/utility/osDetection.h"
+#include "src/utility/OsDetection.h"
 #include <iostream>
 #include <cstdio>
 #include <sstream>
@@ -24,20 +24,19 @@
 #include "src/models/AtomicPropositionsLabeling.h"
 #include "src/modelChecker/EigenDtmcPrctlModelChecker.h"
 #include "src/modelChecker/GmmxxDtmcPrctlModelChecker.h"
-#include "src/parser/readLabFile.h"
-#include "src/parser/readTraFile.h"
-#include "src/parser/readPrctlFile.h"
+#include "src/parser/LabParser.h"
+#include "src/parser/TraParser.h"
+#include "src/parser/PrctlParser.h"
 #include "src/solver/GraphAnalyzer.h"
-#include "src/utility/settings.h"
+#include "src/utility/Settings.h"
 #include "src/formula/Formulas.h"
-#include "src/exceptions/NoConvergence.h"
 
 #include "log4cplus/logger.h"
 #include "log4cplus/loggingmacros.h"
 #include "log4cplus/consoleappender.h"
 #include "log4cplus/fileappender.h"
 
-#include "src/exceptions/InvalidSettings.h"
+#include "src/exceptions/InvalidSettingsException.h"
 
 log4cplus::Logger logger;
 
@@ -76,7 +75,7 @@ int main(const int argc, const char* argv[]) {
 	try {
 		mrmc::settings::Settings::registerModule<mrmc::modelChecker::GmmxxDtmcPrctlModelChecker<double> >();
 		s = mrmc::settings::newInstance(argc, argv, nullptr);
-	} catch (mrmc::exceptions::InvalidSettings& e) {
+	} catch (mrmc::exceptions::InvalidSettingsException& e) {
 		LOG4CPLUS_FATAL(logger, "InvalidSettings error: " << e.what() << ".");
 		LOG4CPLUS_FATAL(logger, "Could not recover from settings error, terminating.");
 		std::cout << "Could not recover from settings error: " << e.what() << "." << std::endl;
@@ -91,7 +90,7 @@ int main(const int argc, const char* argv[]) {
 		return 0;
 	}
 	if (s->isSet("test-prctl")) {
-		mrmc::parser::PRCTLParser parser(s->getString("test-prctl").c_str());
+		mrmc::parser::PrctlParser parser(s->getString("test-prctl").c_str());
 		delete s;
 		return 0;
 	}

src/parser/readLabFile.cpp → src/parser/LabParser.cpp

@@ -1,17 +1,16 @@
 /*!
- * readLabFile.cpp
+ * LabParser.cpp
  *
  *  Created on: 21.11.2012
  *      Author: Gereon Kremer
  */
 
-#include "parser.h"
+#include "src/parser/LabParser.h"
 
-#include "readLabFile.h"
-
-#include "src/exceptions/wrong_file_format.h"
-#include "src/exceptions/file_IO_exception.h"
+#include "src/exceptions/WrongFileFormatException.h"
+#include "src/exceptions/FileIoException.h"
 
+#include "src/utility/OsDetection.h"
 #include <cstdlib>
 #include <cstdio>
 #include <cstring>
@@ -23,12 +22,6 @@
 #include <fcntl.h>
 #include <locale.h>
 
-#if defined LINUX || defined MACOSX
-	#include <sys/mman.h>
-#elif defined WINDOWS
-	#define strncpy strncpy_s
-#endif
-
 #include "log4cplus/logger.h"
 #include "log4cplus/loggingmacros.h"
 extern log4cplus::Logger logger;
@@ -97,7 +90,7 @@ LabParser::LabParser(uint_fast64_t node_count, const char * filename)
 			LOG4CPLUS_ERROR(logger, "Wrong file format in (" << filename << "). File header is corrupted.");
 			if (! foundDecl) LOG4CPLUS_ERROR(logger, "\tDid not find #DECLARATION token.");
 			if (! foundEnd) LOG4CPLUS_ERROR(logger, "\tDid not find #END token.");
-			throw mrmc::exceptions::wrong_file_format();
+			throw mrmc::exceptions::WrongFileFormatException();
 		}
 	}
 	
@@ -127,7 +120,7 @@ LabParser::LabParser(uint_fast64_t node_count, const char * filename)
 				 *	if token is longer than our buffer, the following strncpy code might get risky...
 				 */
 				LOG4CPLUS_ERROR(logger, "Wrong file format in (" << filename << "). Atomic proposition with length > " << (sizeof(proposition)-1) << " was found.");
-				throw mrmc::exceptions::wrong_file_format();
+				throw mrmc::exceptions::WrongFileFormatException();
 			} else if (cnt > 0) {
 				/*
 				 *	next token is: #DECLARATION: just skip it

src/parser/readLabFile.h → src/parser/LabParser.h

@@ -1,10 +1,10 @@
-#ifndef READLABFILE_H_
-#define READLABFILE_H_
+#ifndef MRMC_PARSER_LABPARSER_H_
+#define MRMC_PARSER_LABPARSER_H_
 
 #include "src/models/AtomicPropositionsLabeling.h"
 #include "boost/integer/integer_mask.hpp"
 
-#include "src/parser/parser.h"
+#include "src/parser/Parser.h"
 
 #include <memory>
 
@@ -32,4 +32,4 @@ class LabParser : Parser {
 } // namespace parser
 } // namespace mrmc
 
-#endif /* READLABFILE_H_ */
+#endif /* MRMC_PARSER_LABPARSER_H_ */

src/parser/parser.cpp → src/parser/Parser.cpp

@@ -1,19 +1,10 @@
-#include "src/parser/parser.h"
+#include "src/parser/Parser.h"
 
-#if defined LINUX || defined MACOSX
-#	include <sys/mman.h>
-#	include <unistd.h>
-#elif defined WINDOWS
-#endif
-
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
 #include <iostream>
 #include <cstring>
 
-#include "src/exceptions/file_IO_exception.h"
-#include "src/exceptions/wrong_file_format.h"
+#include "src/exceptions/FileIoException.h"
+#include "src/exceptions/WrongFileFormatException.h"
 
 #include "log4cplus/logger.h"
 #include "log4cplus/loggingmacros.h"
@@ -22,7 +13,7 @@ extern log4cplus::Logger logger;
 /*!
  *	Calls strtol() internally and checks if the new pointer is different
  *	from the original one, i.e. if str != *end. If they are the same, a
- *	mrmc::exceptions::wrong_file_format will be thrown.
+ *	mrmc::exceptions::WrongFileFormatException will be thrown.
  *	@param str String to parse
  *	@param end New pointer will be written there
  *	@return Result of strtol()
@@ -32,7 +23,7 @@ uint_fast64_t mrmc::parser::Parser::checked_strtol(const char* str, char** end)
 	if (str == *end) {
 		LOG4CPLUS_ERROR(logger, "Error while parsing integer. Next input token is not a number.");
 		LOG4CPLUS_ERROR(logger, "\tUpcoming input is: \"" << std::string(str, 0, 16) << "\"");
-		throw mrmc::exceptions::wrong_file_format();
+		throw mrmc::exceptions::WrongFileFormatException("Error while parsing integer. Next input token is not a number.");
 	}
 	return res;
 }
@@ -66,20 +57,20 @@ mrmc::parser::MappedFile::MappedFile(const char* filename) {
 	if (stat64(filename, &(this->st)) != 0) {
 #endif
 		LOG4CPLUS_ERROR(logger, "Error in stat(" << filename << ").");
-		throw exceptions::file_IO_exception("mrmc::parser::MappedFile Error in stat()");
+		throw exceptions::FileIoException("mrmc::parser::MappedFile Error in stat()");
 	}
 	this->file = open(filename, O_RDONLY);
 
 	if (this->file < 0) {
 		LOG4CPLUS_ERROR(logger, "Error in open(" << filename << ").");
-		throw exceptions::file_IO_exception("mrmc::parser::MappedFile Error in open()");
+		throw exceptions::FileIoException("mrmc::parser::MappedFile Error in open()");
 	}
 			
 	this->data = (char*) mmap(NULL, this->st.st_size, PROT_READ, MAP_PRIVATE, this->file, 0);
 	if (this->data == (char*)-1) {
 		close(this->file);
 		LOG4CPLUS_ERROR(logger, "Error in mmap(" << filename << ").");
-		throw exceptions::file_IO_exception("mrmc::parser::MappedFile Error in mmap()");
+		throw exceptions::FileIoException("mrmc::parser::MappedFile Error in mmap()");
 	}
 	this->dataend = this->data + this->st.st_size;
 #elif defined WINDOWS
@@ -89,20 +80,20 @@ mrmc::parser::MappedFile::MappedFile(const char* filename) {
 	 */
 	if (_stat64(filename, &(this->st)) != 0) {
 		LOG4CPLUS_ERROR(logger, "Error in _stat(" << filename << ").");
-		throw exceptions::file_IO_exception("mrmc::parser::MappedFile Error in stat()");
+		throw exceptions::FileIoException("mrmc::parser::MappedFile Error in stat()");
 	}
 		
 	this->file = CreateFileA(filename, GENERIC_READ, 0, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
 	if (this->file == INVALID_HANDLE_VALUE) {
 		LOG4CPLUS_ERROR(logger, "Error in CreateFileA(" << filename << ").");
-		throw exceptions::file_IO_exception("mrmc::parser::MappedFile Error in CreateFileA()");
+		throw exceptions::FileIoException("mrmc::parser::MappedFile Error in CreateFileA()");
 	}
 			
 	this->mapping = CreateFileMappingA(this->file, NULL, PAGE_READONLY, (DWORD)(st.st_size >> 32), (DWORD)st.st_size, NULL);
 	if (this->mapping == NULL) {
 		CloseHandle(this->file);
 		LOG4CPLUS_ERROR(logger, "Error in CreateFileMappingA(" << filename << ").");
-		throw exceptions::file_IO_exception("mrmc::parser::MappedFile Error in CreateFileMappingA()");
+		throw exceptions::FileIoException("mrmc::parser::MappedFile Error in CreateFileMappingA()");
 	}
 			
 	this->data = static_cast<char*>(MapViewOfFile(this->mapping, FILE_MAP_READ, 0, 0, this->st.st_size));
@@ -110,7 +101,7 @@ mrmc::parser::MappedFile::MappedFile(const char* filename) {
 		CloseHandle(this->mapping);
 		CloseHandle(this->file);
 		LOG4CPLUS_ERROR(logger, "Error in MapViewOfFile(" << filename << ").");
-		throw exceptions::file_IO_exception("mrmc::parser::MappedFile Error in MapViewOfFile()");
+		throw exceptions::FileIoException("mrmc::parser::MappedFile Error in MapViewOfFile()");
 	}
 	this->dataend = this->data + this->st.st_size;
 #endif

src/parser/parser.h → src/parser/Parser.h

@@ -1,21 +1,14 @@
 /*
- * parser.h
+ * Parser.h
  *
  *  Created on: 21.11.2012
  *      Author: Gereon Kremer
  */
 
-#ifndef PARSER_H_
-#define PARSER_H_
+#ifndef MRMC_PARSER_PARSER_H_
+#define MRMC_PARSER_PARSER_H_
 
-#include "src/utility/osDetection.h"
-
-#if defined LINUX || defined MACOSX
-#	include <sys/mman.h>
-#elif defined WINDOWS
-#	include <Windows.h>
-#	include <winnt.h>
-#endif
+#include "src/utility/OsDetection.h"
 
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -23,8 +16,8 @@
 #include <iostream>
 
 #include <boost/integer/integer_mask.hpp>
-#include "src/exceptions/file_IO_exception.h"
-#include "src/exceptions/wrong_file_format.h"
+#include "src/exceptions/FileIoException.h"
+#include "src/exceptions/WrongFileFormatException.h"
 
 namespace mrmc {
 
@@ -119,4 +112,4 @@ namespace parser {
 } // namespace parser
 } // namespace mrmc
 
-#endif /* PARSER_H_ */
+#endif /* MRMC_PARSER_PARSER_H_ */

src/parser/readPrctlFile.cpp → src/parser/PrctlParser.cpp

@@ -1,9 +1,6 @@
-#include "src/parser/readPrctlFile.h"
-
-#include "src/parser/parser.h"
+#include "src/parser/PrctlParser.h"
 
 #include <iostream>
-
 #include <map>
 //#include <pair>
 
@@ -61,7 +58,7 @@ namespace
 		/*!
 		 *	@brief Resulting formula.
 		 */
-		mrmc::formula::PCTLFormula<double>* result;
+		mrmc::formula::PctlFormula<double>* result;
 		
 		struct dump
 		{
@@ -133,7 +130,7 @@ namespace
 	};
 }
 
-mrmc::parser::PRCTLParser::PRCTLParser(const char* filename)
+mrmc::parser::PrctlParser::PrctlParser(const char* filename)
 {
 	SpiritParser p;
 	mrmc::parser::MappedFile file(filename);

src/parser/PrctlParser.h

@@ -0,0 +1,33 @@
+#ifndef MRMC_PARSER_PRCTLPARSER_H_
+#define MRMC_PARSER_PRCTLPARSER_H_
+
+#include "src/formula/PctlFormula.h"
+#include "src/parser/Parser.h"
+
+namespace mrmc {
+namespace parser {
+
+/*!
+ *	@brief Load PRCTL file
+ */
+class PrctlParser : Parser
+{
+	public:
+		PrctlParser(const char * filename);
+		 
+		/*!
+		 *	@brief return formula object parsed from file.
+		 */
+		mrmc::formula::PctlFormula<double>* getFormula()
+		{
+			return this->formula;
+		}
+	
+	private:
+		mrmc::formula::PctlFormula<double>* formula;
+};
+
+} // namespace parser
+} // namespace mrmc
+
+#endif /* MRMC_PARSER_PRCTLPARSER_H_ */

src/parser/readTraFile.cpp → src/parser/TraParser.cpp

@@ -1,15 +1,13 @@
 /*!
- *	readTraFile.cpp
+ *	TraParser.cpp
  *
  *	Created on: 20.11.2012
  *		Author: Gereon Kremer
  */
 
-#include "parser.h"
-
-#include "src/parser/readTraFile.h"
-#include "src/exceptions/file_IO_exception.h"
-#include "src/exceptions/wrong_file_format.h"
+#include "src/parser/TraParser.h"
+#include "src/exceptions/FileIoException.h"
+#include "src/exceptions/WrongFileFormatException.h"
 #include "boost/integer/integer_mask.hpp"
 #include <cstdlib>
 #include <cstdio>
@@ -19,10 +17,6 @@
 #include <errno.h>
 #include <time.h>
 #include <sys/stat.h>
-#if defined LINUX || defined MACOSX
-	#include <sys/mman.h>
-#elif defined WINDOWS
-#endif
 #include <fcntl.h>
 #include <locale.h>
 
@@ -137,7 +131,7 @@ TraParser::TraParser(const char * filename)
 	if (non_zero == 0)
 	{
 		LOG4CPLUS_ERROR(logger, "Error while parsing " << filename << ": erroneous file format.");
-		throw mrmc::exceptions::wrong_file_format();
+		throw mrmc::exceptions::WrongFileFormatException();
 	}
 	
 	/*
@@ -190,7 +184,7 @@ TraParser::TraParser(const char * filename)
 		if ((val <= 0.0) || (val > 1.0))
 		{
 			LOG4CPLUS_ERROR(logger, "Found transition probability of " << val << ", but we think probabilities should be from (0,1].");
-			throw mrmc::exceptions::wrong_file_format();
+			throw mrmc::exceptions::WrongFileFormatException();
 		}
 		this->matrix->addNextValue(row,col,val);
 		buf = skipWS(buf);

src/parser/readTraFile.h → src/parser/TraParser.h

@@ -1,9 +1,10 @@
-#ifndef READTRAFILE_H_
-#define READTRAFILE_H_
+#ifndef MRMC_PARSER_TRAPARSER_H_
+#define MRMC_PARSER_TRAPARSER_H_
 
 #include "src/storage/SquareSparseMatrix.h"
 
-#include "src/parser/parser.h"
+#include "src/parser/Parser.h"
+#include "src/utility/OsDetection.h"
 
 #include <memory>
 
@@ -35,4 +36,4 @@ class TraParser : Parser {
 } // namespace parser
 } // namespace mrmc
 
-#endif /* READTRAFILE_H_ */
+#endif /* MRMC_PARSER_TRAPARSER_H_ */

src/parser/readPrctlFile.h

@@ -1,33 +0,0 @@
-#ifndef READPRCTLFILE_H_
-#define READPRCTLFILE_H_
-
-#include "src/formula/PCTLformula.h"
-#include "src/parser/parser.h"
-
-namespace mrmc {
-namespace parser {
-
-/*!
- *	@brief Load PRCTL file
- */
-class PRCTLParser : Parser
-{
-	public:
-		PRCTLParser(const char * filename);
-		 
-		/*!
-		 *	@brief return formula object parsed from file.
-		 */
-		mrmc::formula::PCTLFormula<double>* getFormula()
-		{
-			return this->formula;
-		}
-	
-	private:
-		mrmc::formula::PCTLFormula<double>* formula;
-};
-
-} // namespace parser
-} // namespace mrmc
-
-#endif /* READPRCTLFILE_H_ */

src/reward/reward_model.h → src/reward/RewardModel.h

@@ -1,12 +1,12 @@
 /*
- * reward_model.h
+ * RewardModel.h
  *
  *  Created on: 25.10.2012
  *      Author: Philipp Berger
  */
 
-#ifndef MRMC_REWARD_REWARD_MODEL_H_
-#define MRMC_REWARD_REWARD_MODEL_H_
+#ifndef MRMC_REWARD_REWARDMODEL_H_
+#define MRMC_REWARD_REWARDMODEL_H_
 
 #include <stdexcept>
 
@@ -76,4 +76,4 @@ class RewardModel {
 
 } //namespace mrmc
 
-#endif /* MRMC_REWARD_REWARD_MODEL_H_ */
+#endif /* MRMC_REWARD_REWARDMODEL_H_ */

src/solver/GraphAnalyzer.h

@@ -5,11 +5,11 @@
  *      Author: Christian Dehnert
  */
 
-#ifndef GRAPHANALYZER_H_
-#define GRAPHANALYZER_H_
+#ifndef MRMC_SOLVER_GRAPHANALYZER_H_
+#define MRMC_SOLVER_GRAPHANALYZER_H_
 
 #include "src/models/Dtmc.h"
-#include "src/exceptions/invalid_argument.h"
+#include "src/exceptions/InvalidArgumentException.h"
 
 #include "log4cplus/logger.h"
 #include "log4cplus/loggingmacros.h"
@@ -38,7 +38,7 @@ public:
 		// Check for valid parameter.
 		if (existsPhiUntilPsiStates == nullptr) {
 			LOG4CPLUS_ERROR(logger, "Parameter 'existsPhiUntilPhiStates' must not be null.");
-			throw mrmc::exceptions::invalid_argument("Parameter 'existsPhiUntilPhiStates' must not be null.");
+			throw mrmc::exceptions::InvalidArgumentException("Parameter 'existsPhiUntilPhiStates' must not be null.");
 		}
 
 		// Get the backwards transition relation from the model to ease the search.
@@ -85,7 +85,7 @@ public:
 		// Check for valid parameter.
 		if (alwaysPhiUntilPsiStates == nullptr) {
 			LOG4CPLUS_ERROR(logger, "Parameter 'alwaysPhiUntilPhiStates' must not be null.");
-			throw mrmc::exceptions::invalid_argument("Parameter 'alwaysPhiUntilPhiStates' must not be null.");
+			throw mrmc::exceptions::InvalidArgumentException("Parameter 'alwaysPhiUntilPhiStates' must not be null.");
 		}
 
 		GraphAnalyzer::getExistsPhiUntilPsiStates(model, ~psiStates, ~existsPhiUntilPsiStates, alwaysPhiUntilPsiStates);
@@ -109,11 +109,11 @@ public:
 		// Check for valid parameters.
 		if (existsPhiUntilPsiStates == nullptr) {
 			LOG4CPLUS_ERROR(logger, "Parameter 'existsPhiUntilPhiStates' must not be null.");
-			throw mrmc::exceptions::invalid_argument("Parameter 'existsPhiUntilPhiStates' must not be null.");
+			throw mrmc::exceptions::InvalidArgumentException("Parameter 'existsPhiUntilPhiStates' must not be null.");
 		}
 		if (alwaysPhiUntilPsiStates == nullptr) {
 			LOG4CPLUS_ERROR(logger, "Parameter 'alwaysPhiUntilPhiStates' must not be null.");
-			throw mrmc::exceptions::invalid_argument("Parameter 'alwaysPhiUntilPhiStates' must not be null.");
+			throw mrmc::exceptions::InvalidArgumentException("Parameter 'alwaysPhiUntilPhiStates' must not be null.");
 		}
 
 		// Perform search.
@@ -127,4 +127,4 @@ public:
 
 } // namespace mrmc
 
-#endif /* GRAPHANALYZER_H_ */
+#endif /* MRMC_SOLVER_GRAPHANALYZER_H_ */

src/storage/BitVector.h

@@ -1,16 +1,16 @@
-#ifndef MRMC_VECTOR_BITVECTOR_H_
-#define MRMC_VECTOR_BITVECTOR_H_
+#ifndef MRMC_STORAGE_BITVECTOR_H_
+#define MRMC_STORAGE_BITVECTOR_H_
 
 #include <exception>
 #include <new>
 #include <cmath>
 #include "boost/integer/integer_mask.hpp"
 
-#include "src/exceptions/invalid_state.h"
-#include "src/exceptions/invalid_argument.h"
-#include "src/exceptions/out_of_range.h"
+#include "src/exceptions/InvalidStateException.h"
+#include "src/exceptions/InvalidArgumentException.h"
+#include "src/exceptions/OutOfRangeException.h"
 
-#include "src/utility/osDetection.h"
+#include "src/utility/OsDetection.h"
 #include "log4cplus/logger.h"
 #include "log4cplus/loggingmacros.h"
 
@@ -102,7 +102,7 @@ public:
 		// Check whether the given length is valid.
 		if (length == 0) {
 			LOG4CPLUS_ERROR(logger, "Trying to create bit vector of size 0.");
-			throw mrmc::exceptions::invalid_argument("Trying to create a bit vector of size 0.");
+			throw mrmc::exceptions::InvalidArgumentException("Trying to create a bit vector of size 0.");
 		}
 
 		// Compute the correct number of buckets needed to store the given number of bits
@@ -205,7 +205,7 @@ public:
 	 */
 	void set(const uint_fast64_t index, const bool value) {
 		uint_fast64_t bucket = index >> 6;
-		if (bucket >= this->bucketCount) throw mrmc::exceptions::out_of_range();
+		if (bucket >= this->bucketCount) throw mrmc::exceptions::OutOfRangeException();
 		uint_fast64_t mask = static_cast<uint_fast64_t>(1) << (index & mod64mask);
 		if (value) {
 			this->bucketArray[bucket] |= mask;
@@ -223,7 +223,7 @@ public:
 	 */
 	bool get(const uint_fast64_t index) const {
 		uint_fast64_t bucket = index >> 6;
-		if (bucket >= this->bucketCount) throw mrmc::exceptions::out_of_range();
+		if (bucket >= this->bucketCount) throw mrmc::exceptions::OutOfRangeException();
 		uint_fast64_t mask = static_cast<uint_fast64_t>(1) << (index & mod64mask);
 		return ((this->bucketArray[bucket] & mask) == mask);
 	}
@@ -544,4 +544,4 @@ private:
 
 } // namespace mrmc
 
-#endif // MRMC_SPARSE_STATIC_SPARSE_MATRIX_H_
+#endif // MRMC_STORAGE_BITVECTOR_H_

src/storage/SquareSparseMatrix.h

@@ -7,14 +7,14 @@
 #include <iostream>
 #include "boost/integer/integer_mask.hpp"
 
-#include "src/exceptions/invalid_state.h"
-#include "src/exceptions/invalid_argument.h"
-#include "src/exceptions/out_of_range.h"
-#include "src/exceptions/file_IO_exception.h"
+#include "src/exceptions/InvalidStateException.h"
+#include "src/exceptions/InvalidArgumentException.h"
+#include "src/exceptions/OutOfRangeException.h"
+#include "src/exceptions/FileIoException.h"
 #include "src/storage/BitVector.h"
 #include "src/storage/JacobiDecomposition.h"
 
-#include "src/utility/const_templates.h"
+#include "src/utility/ConstTemplates.h"
 #include "Eigen/Sparse"
 #include "gmm/gmm_matrix.h"
 
@@ -78,7 +78,7 @@ public:
 		// Check whether copying the matrix is safe.
 		if (!ssm.hasError()) {
 			LOG4CPLUS_ERROR(logger, "Trying to copy sparse matrix in error state.");
-			throw mrmc::exceptions::invalid_argument("Trying to copy sparse matrix in error state.");
+			throw mrmc::exceptions::InvalidArgumentException("Trying to copy sparse matrix in error state.");
 		} else {
 			// Try to prepare the internal storage and throw an error in case
 			// of a failure.
@@ -142,15 +142,15 @@ public:
 		if (internalStatus != MatrixStatus::UnInitialized) {
 			triggerErrorState();
 			LOG4CPLUS_ERROR(logger, "Trying to initialize matrix that is not uninitialized.");
-			throw mrmc::exceptions::invalid_state("Trying to initialize matrix that is not uninitialized.");
+			throw mrmc::exceptions::InvalidStateException("Trying to initialize matrix that is not uninitialized.");
 		} else if (rowCount == 0) {
 			triggerErrorState();
 			LOG4CPLUS_ERROR(logger, "Trying to create initialize a matrix with 0 rows.");
-			throw mrmc::exceptions::invalid_argument("Trying to create initialize a matrix with 0 rows.");
+			throw mrmc::exceptions::InvalidArgumentException("Trying to create initialize a matrix with 0 rows.");
 		} else if (((rowCount * rowCount) - rowCount) < nonZeroEntries) {
 			triggerErrorState();
 			LOG4CPLUS_ERROR(logger, "Trying to initialize a matrix with more non-zero entries than there can be.");
-			throw mrmc::exceptions::invalid_argument("Trying to initialize a matrix with more non-zero entries than there can be.");
+			throw mrmc::exceptions::InvalidArgumentException("Trying to initialize a matrix with more non-zero entries than there can be.");
 		} else {
 			// If it is safe, initialize necessary members and prepare the
 			// internal storage.
@@ -181,7 +181,7 @@ public:
 		if (!eigenSparseMatrix.isCompressed()) {
 			triggerErrorState();
 			LOG4CPLUS_ERROR(logger, "Trying to initialize from an Eigen matrix that is not in compressed form.");
-			throw mrmc::exceptions::invalid_argument("Trying to initialize from an Eigen matrix that is not in compressed form.");
+			throw mrmc::exceptions::InvalidArgumentException("Trying to initialize from an Eigen matrix that is not in compressed form.");
 		}
 
 		// Compute the actual (i.e. non-diagonal) number of non-zero entries.
@@ -274,7 +274,7 @@ public:
 		if ((row > rowCount) || (col > rowCount)) {
 			triggerErrorState();
 			LOG4CPLUS_ERROR(logger, "Trying to add a value at illegal position (" << row << ", " << col << ").");
-			throw mrmc::exceptions::out_of_range("Trying to add a value at illegal position.");
+			throw mrmc::exceptions::OutOfRangeException("Trying to add a value at illegal position.");
 		}
 
 		if (row == col) { // Set a diagonal element.
@@ -307,11 +307,11 @@ public:
 		if (!isInitialized()) {
 			triggerErrorState();
 			LOG4CPLUS_ERROR(logger, "Trying to finalize an uninitialized matrix.");
-			throw mrmc::exceptions::invalid_state("Trying to finalize an uninitialized matrix.");
+			throw mrmc::exceptions::InvalidStateException("Trying to finalize an uninitialized matrix.");
 		} else if (currentSize != nonZeroEntryCount) {
 			triggerErrorState();
 			LOG4CPLUS_ERROR(logger, "Trying to finalize a matrix that was initialized with more non-zero entries than given.");
-			throw mrmc::exceptions::invalid_state("Trying to finalize a matrix that was initialized with more non-zero entries than given.");
+			throw mrmc::exceptions::InvalidStateException("Trying to finalize a matrix that was initialized with more non-zero entries than given.");
 		} else {
 			// Fill in the missing entries in the row_indications array.
 			// (Can happen because of empty rows at the end.)
@@ -345,7 +345,7 @@ public:
 		// Check for illegal access indices.
 		if ((row > rowCount) || (col > rowCount)) {
 			LOG4CPLUS_ERROR(logger, "Trying to read a value from illegal position (" << row << ", " << col << ").");
-			throw mrmc::exceptions::out_of_range("Trying to read a value from illegal position.");
+			throw mrmc::exceptions::OutOfRangeException("Trying to read a value from illegal position.");
 			return false;
 		}
 
@@ -395,7 +395,7 @@ public:
 		// Check for illegal access indices.
 		if ((row > rowCount) || (col > rowCount)) {
 			LOG4CPLUS_ERROR(logger, "Trying to read a value from illegal position (" << row << ", " << col << ").");
-			throw mrmc::exceptions::out_of_range("Trying to read a value from illegal position.");
+			throw mrmc::exceptions::OutOfRangeException("Trying to read a value from illegal position.");
 		}
 
 		// Read elements on the diagonal directly.
@@ -422,7 +422,7 @@ public:
 			++rowStart;
 		}
 
-		throw mrmc::exceptions::invalid_argument("Trying to get a reference to a non-existant value.");
+		throw mrmc::exceptions::InvalidArgumentException("Trying to get a reference to a non-existant value.");
 	}
 
 	/*!
@@ -514,7 +514,7 @@ public:
 		if (!isReadReady()) {
 			triggerErrorState();
 			LOG4CPLUS_ERROR(logger, "Trying to convert a matrix that is not in a readable state to an Eigen matrix.");
-			throw mrmc::exceptions::invalid_state("Trying to convert a matrix that is not in a readable state to an Eigen matrix.");
+			throw mrmc::exceptions::InvalidStateException("Trying to convert a matrix that is not in a readable state to an Eigen matrix.");
 		} else {
 			// Create the resulting matrix.
 			int_fast32_t eigenRows = static_cast<int_fast32_t>(rowCount);
@@ -669,7 +669,7 @@ public:
 			}
 		}
 		// Fill in sentinel element at the end.
-		result->jc[rowCount] = realNonZeros;
+		result->jc[rowCount] = static_cast<unsigned int>(realNonZeros);
 
 		// Now, we can copy the temporary array to the GMMXX format.
 		result->ir.resize(realNonZeros);
@@ -732,7 +732,7 @@ public:
 		// Check whether the accessed state exists.
 		if (row > rowCount) {
 			LOG4CPLUS_ERROR(logger, "Trying to make an illegal row " << row << " absorbing.");
-			throw mrmc::exceptions::out_of_range("Trying to make an illegal row absorbing.");
+			throw mrmc::exceptions::OutOfRangeException("Trying to make an illegal row absorbing.");
 			return false;
 		}
 
@@ -796,7 +796,7 @@ public:
 		// Check for valid constraint.
 		if (constraint.getNumberOfSetBits() == 0) {
 			LOG4CPLUS_ERROR(logger, "Trying to create a sub-matrix of size 0.");
-			throw mrmc::exceptions::invalid_argument("Trying to create a sub-matrix of size 0.");
+			throw mrmc::exceptions::InvalidArgumentException("Trying to create a sub-matrix of size 0.");
 		}
 
 		// First, we need to determine the number of non-zero entries of the

src/utility/const_templates.h → src/utility/ConstTemplates.h

@@ -1,12 +1,12 @@
 /*
- * const_templates.h
+ * ConstTemplates.h
  *
  *  Created on: 11.10.2012
  *      Author: Thomas Heinemann
  */
 
-#ifndef CONST_TEMPLATES_H_
-#define CONST_TEMPLATES_H_
+#ifndef MRMC_UTILITY_CONSTTEMPLATES_H_
+#define MRMC_UTILITY_CONSTTEMPLATES_H_
 
 namespace mrmc {
 
@@ -93,4 +93,4 @@ inline double constGetOne(double&) {
 } //namespace mrmc
 
 
-#endif /* CONST_TEMPLATES_H_ */
+#endif /* MRMC_UTILITY_CONSTTEMPLATES_H_ */

src/utility/ioUtility.cpp → src/utility/IoUtility.cpp

@@ -1,13 +1,13 @@
 /*
- * ioUtility.cpp
+ * IoUtility.cpp
  *
  *  Created on: 17.10.2012
  *      Author: Thomas Heinemann
  */
 
-#include "src/utility/ioUtility.h"
-#include "src/parser/readTraFile.h"
-#include "src/parser/readLabFile.h"
+#include "src/utility/IoUtility.h"
+#include "src/parser/TraParser.h"
+#include "src/parser/LabParser.h"
 
 #include <fstream>
 

src/utility/ioUtility.h → src/utility/IoUtility.h

@@ -1,12 +1,12 @@
 /*
- * ioUtility.h
+ * IoUtility.h
  *
  *  Created on: 17.10.2012
  *      Author: Thomas Heinemann
  */
 
-#ifndef UTILITY_H_
-#define UTILITY_H_
+#ifndef MRMC_UTILITY_IOUTILITY_H_
+#define MRMC_UTILITY_IOUTILITY_H_
 
 #include "src/models/Dtmc.h"
 
@@ -42,4 +42,4 @@ mrmc::models::Dtmc<double>* parseDTMC(const char* tra_file, const char* lab_file
 
 } //namespace mrmc
 
-#endif /* UTILITY_H_ */
+#endif /* MRMC_UTILITY_IOUTILITY_H_ */

src/utility/osDetection.h → src/utility/OsDetection.h

@@ -1,15 +1,21 @@
-#pragma once
+#ifndef MRMC_UTILITY_OSDETECTION_H_
+#define MRMC_UTILITY_OSDETECTION_H_
 
 #if defined __linux__ || defined __linux
 #	define LINUX
 #elif defined TARGET_OS_MAC || defined __apple__ || defined __APPLE__
 #	define MACOSX
 #	define _DARWIN_USE_64_BIT_INODE
+#	include <sys/mman.h>
+#	include <unistd.h>
 #elif defined _WIN32 || defined _WIN64
 #	define WINDOWS
 #	define NOMINMAX
 #	include <Windows.h>
 #	include <winnt.h>
+#	define strncpy strncpy_s
 #else
 #	error Could not detect Operating System
 #endif
+
+#endif // MRMC_UTILITY_OSDETECTION_H_

src/utility/settings.cpp → src/utility/Settings.cpp

@@ -1,11 +1,11 @@
 /*
- * settings.cpp
+ * Settings.cpp
  *
  *  Created on: 22.11.2012
  *      Author: Gereon Kremer
  */
 
-#include "src/utility/settings.h"
+#include "src/utility/Settings.h"
 
 #include "src/exceptions/BaseException.h"
 
@@ -102,16 +102,16 @@ Settings::Settings(const int argc, const char* argv[], const char* filename) {
 		LOG4CPLUS_ERROR(logger, "Could not read config file");
 	}
 	catch (bpo::required_option e) {
-		throw mrmc::exceptions::InvalidSettings() << "Required option missing";
+		throw mrmc::exceptions::InvalidSettingsException() << "Required option missing";
 	}
 	catch (bpo::validation_error e) {
-		throw mrmc::exceptions::InvalidSettings() << "Validation failed: " << e.what();
+		throw mrmc::exceptions::InvalidSettingsException() << "Validation failed: " << e.what();
 	}
 	catch (bpo::invalid_command_line_syntax e) {
-		throw mrmc::exceptions::InvalidSettings() << e.what();
+		throw mrmc::exceptions::InvalidSettingsException() << e.what();
 	}
 	catch (bpo::error e) {
-		throw mrmc::exceptions::InvalidSettings() << e.what();
+		throw mrmc::exceptions::InvalidSettingsException() << e.what();
 	}
 }
 

src/utility/settings.h → src/utility/Settings.h

@@ -1,12 +1,12 @@
 /*
- * settings.h
+ * Settings.h
  *
  *  Created on: 22.11.2012
  *      Author: Gereon Kremer
  */
 
-#ifndef SETTINGS_H_
-#define SETTINGS_H_
+#ifndef MRMC_SETTINGS_SETTINGS_H_
+#define MRMC_SETTINGS_SETTINGS_H_
 
 #include <iostream>
 #include <sstream>
@@ -14,7 +14,7 @@
 #include <utility>
 #include <memory>
 #include <boost/program_options.hpp>
-#include "src/exceptions/InvalidSettings.h"
+#include "src/exceptions/InvalidSettingsException.h"
 
 namespace mrmc {
 
@@ -52,7 +52,7 @@ namespace settings {
 			 */
 			template <typename T>
 			const T& get(const std::string &name) const {
-				if (this->vm.count(name) == 0) throw mrmc::exceptions::InvalidSettings() << "Could not read option " << name << ".";
+				if (this->vm.count(name) == 0) throw mrmc::exceptions::InvalidSettingsException() << "Could not read option " << name << ".";
 				return this->vm[name].as<T>();
 			}
 		
@@ -209,4 +209,4 @@ namespace settings {
 } // namespace settings
 } // namespace mrmc
 
-#endif // SETTINGS_H_
+#endif // MRMC_SETTINGS_SETTINGS_H_

src/utility/vector.h → src/utility/Vector.h

@@ -1,12 +1,12 @@
 /*
- * vector.h
+ * Vector.h
  *
  *  Created on: 06.12.2012
  *      Author: Christian Dehnert
  */
 
-#ifndef VECTOR_H_
-#define VECTOR_H_
+#ifndef MRMC_UTILITY_VECTOR_H_
+#define MRMC_UTILITY_VECTOR_H_
 
 #include "Eigen/src/Core/Matrix.h"
 
@@ -40,4 +40,4 @@ void setVectorValues(Eigen::Matrix<T, -1, 1, 0, -1, 1>* eigenVector, const mrmc:
 
 } //namespace mrmc
 
-#endif /* VECTOR_H_ */
+#endif /* MRMC_UTILITY_VECTOR_H_ */

test/eigen/sparse_matrix_test.cpp → test/eigen/EigenSparseMatrixTest.cpp

@@ -1,7 +1,7 @@
 #include "gtest/gtest.h"
 
 #include "Eigen/Sparse"
-#include "src/exceptions/invalid_argument.h"
+#include "src/exceptions/InvalidArgumentException.h"
 #include "boost/integer/integer_mask.hpp"
 
 TEST(EigenSparseMatrixTest, BasicReadWriteTest) {

test/parser/parse_dtmc_test.cpp → test/parser/ParseDtmcTest.cpp

@@ -1,5 +1,5 @@
 /*
- * parse_dtmc_test.cpp
+ * ParseDtmcTest.cpp
  *
  *  Created on: 03.12.2012
  *      Author: Thomas Heinemann
@@ -8,7 +8,7 @@
 
 #include "gtest/gtest.h"
 #include "mrmc-config.h"
-#include "src/utility/ioUtility.h"
+#include "src/utility/IoUtility.h"
 
 TEST(ParseDtmcTest, parseAndOutput) {
 	mrmc::models::Dtmc<double>* myDtmc;

test/parser/read_lab_file_test.cpp → test/parser/ReadLabFileTest.cpp

@@ -1,5 +1,5 @@
 /*
- * read_lab_file_test.cpp
+ * ReadLabFileTest.cpp
  *
  *  Created on: 12.09.2012
  *      Author: Thomas Heinemann
@@ -8,15 +8,15 @@
 #include "gtest/gtest.h"
 #include "mrmc-config.h"
 #include "src/models/AtomicPropositionsLabeling.h"
-#include "src/parser/readLabFile.h"
-#include "src/exceptions/file_IO_exception.h"
-#include "src/exceptions/wrong_file_format.h"
+#include "src/parser/LabParser.h"
+#include "src/exceptions/FileIoException.h"
+#include "src/exceptions/WrongFileFormatException.h"
 
 #include <memory>
 
 TEST(ReadLabFileTest, NonExistingFileTest) {
    //No matter what happens, please don't create a file with the name "nonExistingFile.not"! :-)
-   ASSERT_THROW(mrmc::parser::LabParser(0,MRMC_CPP_TESTS_BASE_PATH "/nonExistingFile.not"), mrmc::exceptions::file_IO_exception);
+   ASSERT_THROW(mrmc::parser::LabParser(0,MRMC_CPP_TESTS_BASE_PATH "/nonExistingFile.not"), mrmc::exceptions::FileIoException);
 }
 
 TEST(ReadLabFileTest, ParseTest) {
@@ -86,14 +86,14 @@ TEST(ReadLabFileTest, ParseTest) {
 }
 
 TEST(ReadLabFileTest, WrongHeaderTest1) {
-   ASSERT_THROW(mrmc::parser::LabParser(3, MRMC_CPP_TESTS_BASE_PATH "/parser/lab_files/wrong_format_header1.lab"), mrmc::exceptions::wrong_file_format);
+   ASSERT_THROW(mrmc::parser::LabParser(3, MRMC_CPP_TESTS_BASE_PATH "/parser/lab_files/wrong_format_header1.lab"), mrmc::exceptions::WrongFileFormatException);
 }
 
 TEST(ReadLabFileTest, WrongHeaderTest2) {
-   ASSERT_THROW(mrmc::parser::LabParser(3, MRMC_CPP_TESTS_BASE_PATH "/parser/lab_files/wrong_format_header2.lab"), mrmc::exceptions::wrong_file_format);
+   ASSERT_THROW(mrmc::parser::LabParser(3, MRMC_CPP_TESTS_BASE_PATH "/parser/lab_files/wrong_format_header2.lab"), mrmc::exceptions::WrongFileFormatException);
 }
 
 TEST(ReadLabFileTest, WrongPropositionTest) {
-   ASSERT_THROW(mrmc::parser::LabParser(3, MRMC_CPP_TESTS_BASE_PATH "/parser/lab_files/wrong_format_proposition.lab"), mrmc::exceptions::wrong_file_format);
+   ASSERT_THROW(mrmc::parser::LabParser(3, MRMC_CPP_TESTS_BASE_PATH "/parser/lab_files/wrong_format_proposition.lab"), mrmc::exceptions::WrongFileFormatException);
 }
 

test/parser/read_tra_file_test.cpp → test/parser/ReadTraFileTest.cpp

@@ -1,5 +1,5 @@
 /*
- * read_tra_file_test.cpp
+ * ReadTraFileTest.cpp
  *
  *  Created on: 16.08.2012
  *      Author: Thomas Heinemann
@@ -8,15 +8,15 @@
 #include "gtest/gtest.h"
 #include "mrmc-config.h"
 #include "src/storage/SquareSparseMatrix.h"
-#include "src/parser/readTraFile.h"
-#include "src/exceptions/file_IO_exception.h"
-#include "src/exceptions/wrong_file_format.h"
+#include "src/parser/TraParser.h"
+#include "src/exceptions/FileIoException.h"
+#include "src/exceptions/WrongFileFormatException.h"
 
-#include "src/utility/ioUtility.h"
+#include "src/utility/IoUtility.h"
 
 TEST(ReadTraFileTest, NonExistingFileTest) {
    //No matter what happens, please don't create a file with the name "nonExistingFile.not"! :-)
-   ASSERT_THROW(mrmc::parser::TraParser(MRMC_CPP_TESTS_BASE_PATH "/nonExistingFile.not"), mrmc::exceptions::file_IO_exception);
+   ASSERT_THROW(mrmc::parser::TraParser(MRMC_CPP_TESTS_BASE_PATH "/nonExistingFile.not"), mrmc::exceptions::FileIoException);
 }
 
 /* The following test case is based on one of the original MRMC test cases
@@ -69,13 +69,13 @@ TEST(ReadTraFileTest, ParseFileTest1) {
 }
 
 TEST(ReadTraFileTest, WrongFormatTestHeader1) {
-   ASSERT_THROW(mrmc::parser::TraParser(MRMC_CPP_TESTS_BASE_PATH "/parser/tra_files/wrong_format_header1.tra"), mrmc::exceptions::wrong_file_format);
+   ASSERT_THROW(mrmc::parser::TraParser(MRMC_CPP_TESTS_BASE_PATH "/parser/tra_files/wrong_format_header1.tra"), mrmc::exceptions::WrongFileFormatException);
 }
 
 TEST(ReadTraFileTest, WrongFormatTestHeader2) {
-   ASSERT_THROW(mrmc::parser::TraParser(MRMC_CPP_TESTS_BASE_PATH "/parser/tra_files/wrong_format_header2.tra"), mrmc::exceptions::wrong_file_format);
+   ASSERT_THROW(mrmc::parser::TraParser(MRMC_CPP_TESTS_BASE_PATH "/parser/tra_files/wrong_format_header2.tra"), mrmc::exceptions::WrongFileFormatException);
 }
 
 TEST(ReadTraFileTest, WrongFormatTestTransition) {
-   ASSERT_THROW(mrmc::parser::TraParser(MRMC_CPP_TESTS_BASE_PATH "/parser/tra_files/wrong_format_transition.tra"), mrmc::exceptions::wrong_file_format);
+   ASSERT_THROW(mrmc::parser::TraParser(MRMC_CPP_TESTS_BASE_PATH "/parser/tra_files/wrong_format_transition.tra"), mrmc::exceptions::WrongFileFormatException);
 }

test/reward/reward_model_test.cpp → test/reward/RewardModelTest.cpp

@@ -1,11 +1,11 @@
 #include "gtest/gtest.h"
 
 #include "Eigen/Sparse"
-#include "src/exceptions/invalid_argument.h"
+#include "src/exceptions/InvalidArgumentException.h"
 #include "boost/integer/integer_mask.hpp"
 #include <vector>
 
-#include "reward/reward_model.h"
+#include "reward/RewardModel.h"
 
 TEST(RewardModelTest, ReadWriteTest) {
 	// 50 entries

test/storage/BitVectorTest.cpp

@@ -1,6 +1,6 @@
 #include "gtest/gtest.h"
 #include "src/storage/BitVector.h"
-#include "src/exceptions/invalid_argument.h"
+#include "src/exceptions/InvalidArgumentException.h"
 
 TEST(BitVectorTest, GetSetTest) {
 	mrmc::storage::BitVector *bv = NULL;

test/storage/SquareSparseMatrixTest.cpp

@@ -1,12 +1,13 @@
 #include "gtest/gtest.h"
 #include "src/storage/SquareSparseMatrix.h"
-#include "src/exceptions/invalid_argument.h"
+#include "src/exceptions/InvalidArgumentException.h"
+#include "src/exceptions/OutOfRangeException.h"
 
 TEST(SquareSparseMatrixTest, ZeroRowsTest) {
 	mrmc::storage::SquareSparseMatrix<int> *ssm = new mrmc::storage::SquareSparseMatrix<int>(0);
 	ASSERT_EQ(ssm->getState(), mrmc::storage::SquareSparseMatrix<int>::MatrixStatus::UnInitialized);
 
-	ASSERT_THROW(ssm->initialize(50), mrmc::exceptions::invalid_argument);
+	ASSERT_THROW(ssm->initialize(50), mrmc::exceptions::InvalidArgumentException);
 	ASSERT_EQ(ssm->getState(), mrmc::storage::SquareSparseMatrix<int>::MatrixStatus::Error);
 
 	delete ssm;
@@ -16,7 +17,7 @@ TEST(SquareSparseMatrixTest, TooManyEntriesTest) {
 	mrmc::storage::SquareSparseMatrix<int> *ssm = new mrmc::storage::SquareSparseMatrix<int>(2);
 	ASSERT_EQ(ssm->getState(), mrmc::storage::SquareSparseMatrix<int>::MatrixStatus::UnInitialized);
 
-	ASSERT_THROW(ssm->initialize(10), mrmc::exceptions::invalid_argument);
+	ASSERT_THROW(ssm->initialize(10), mrmc::exceptions::InvalidArgumentException);
 	ASSERT_EQ(ssm->getState(), mrmc::storage::SquareSparseMatrix<int>::MatrixStatus::Error);
 
 	delete ssm;
@@ -29,16 +30,16 @@ TEST(SquareSparseMatrixTest, addNextValueTest) {
 	ASSERT_NO_THROW(ssm->initialize(1));
 	ASSERT_EQ(ssm->getState(), mrmc::storage::SquareSparseMatrix<int>::MatrixStatus::Initialized);
 
-	ASSERT_THROW(ssm->addNextValue(-1, 1, 1), mrmc::exceptions::out_of_range);
+	ASSERT_THROW(ssm->addNextValue(-1, 1, 1), mrmc::exceptions::OutOfRangeException);
 	ASSERT_EQ(ssm->getState(), mrmc::storage::SquareSparseMatrix<int>::MatrixStatus::Error);
 
-	ASSERT_THROW(ssm->addNextValue(1, -1, 1), mrmc::exceptions::out_of_range);
+	ASSERT_THROW(ssm->addNextValue(1, -1, 1), mrmc::exceptions::OutOfRangeException);
 	ASSERT_EQ(ssm->getState(), mrmc::storage::SquareSparseMatrix<int>::MatrixStatus::Error);
 
-	ASSERT_THROW(ssm->addNextValue(6, 1, 1), mrmc::exceptions::out_of_range);
+	ASSERT_THROW(ssm->addNextValue(6, 1, 1), mrmc::exceptions::OutOfRangeException);
 	ASSERT_EQ(ssm->getState(), mrmc::storage::SquareSparseMatrix<int>::MatrixStatus::Error);
 
-	ASSERT_THROW(ssm->addNextValue(1, 6, 1), mrmc::exceptions::out_of_range);
+	ASSERT_THROW(ssm->addNextValue(1, 6, 1), mrmc::exceptions::OutOfRangeException);
 	ASSERT_EQ(ssm->getState(), mrmc::storage::SquareSparseMatrix<int>::MatrixStatus::Error);
 
 	delete ssm;
@@ -57,7 +58,7 @@ TEST(SquareSparseMatrixTest, finalizeTest) {
 	ASSERT_NO_THROW(ssm->addNextValue(1, 5, 1));
 	ASSERT_EQ(ssm->getState(), mrmc::storage::SquareSparseMatrix<int>::MatrixStatus::Initialized);
 
-	ASSERT_THROW(ssm->finalize(), mrmc::exceptions::invalid_state);
+	ASSERT_THROW(ssm->finalize(), mrmc::exceptions::InvalidStateException);
 	ASSERT_EQ(ssm->getState(), mrmc::storage::SquareSparseMatrix<int>::MatrixStatus::Error);
 
 	delete ssm;