integrated renaming within master branch into code merged from parser branch

src/parser/readLabFile.h

@@ -1,7 +1,7 @@
 #ifndef READLABFILE_H_
 #define READLABFILE_H_
 
-#include "src/models/atomic_propositions_labeling.h"
+#include "src/models/AtomicPropositionsLabeling.h"
 #include "boost/integer/integer_mask.hpp"
 
 

src/parser/readTraFile.cpp

@@ -104,7 +104,7 @@ static uint_fast32_t makeFirstPass(char* buf, uint_fast32_t &maxnode)
  *	@return a pointer to the created sparse matrix.
  */
 
-sparse::StaticSparseMatrix<double> * readTraFile(const char * filename) {
+sparse::SquareSparseMatrix<double> * readTraFile(const char * filename) {
 	/*
 	*	enforce locale where decimal point is '.'
 	*/
@@ -131,7 +131,7 @@ sparse::StaticSparseMatrix<double> * readTraFile(const char * filename) {
 	 *	
 	 *	from here on, we already know that the file header is correct
 	 */
-	sparse::StaticSparseMatrix<double> *sp = NULL;
+	sparse::SquareSparseMatrix<double> *sp = NULL;
 
 	/*
 	 *	read file header, extract number of states
@@ -151,7 +151,7 @@ sparse::StaticSparseMatrix<double> * readTraFile(const char * filename) {
 	 *	Memory for diagonal elements is automatically allocated, hence only the number of non-diagonal
 	 *	non-zero elements has to be specified (which is non_zero, computed by make_first_pass)
 	 */
-	sp = new sparse::StaticSparseMatrix<double>(maxnode + 1);
+	sp = new sparse::SquareSparseMatrix<double>(maxnode + 1);
 	if (sp == NULL)	throw std::bad_alloc();
 	sp->initialize(non_zero);
 

src/parser/readTraFile.h

@@ -1,7 +1,7 @@
 #ifndef READTRAFILE_H_
 #define READTRAFILE_H_
 
-#include "src/sparse/static_sparse_matrix.h"
+#include "src/storage/SquareSparseMatrix.h"
 
 namespace mrmc {
 namespace parser {
@@ -10,7 +10,7 @@ namespace parser {
  *	@brief	Load transition system from file and return initialized
  *	StaticSparseMatrix object.
  */
-mrmc::sparse::StaticSparseMatrix<double> * readTraFile(const char * filename);
+mrmc::storage::SquareSparseMatrix<double> * readTraFile(const char * filename);
 		
 } // namespace parser
 } // namespace mrmc

src/utility/utility.cpp

@@ -74,7 +74,7 @@ void dtmcToDot(mrmc::models::Dtmc<double>* dtmc, const char* filename) {
 }
 
 mrmc::models::Dtmc<double>* parseDTMC(const char* tra_file, const char* lab_file) {
-   mrmc::sparse::StaticSparseMatrix<double>* transition_matrix =
+   mrmc::storage::SquareSparseMatrix<double>* transition_matrix =
          mrmc::parser::readTraFile(tra_file);
    uint_fast64_t node_count = transition_matrix->getRowCount();