From 8d89375c6ea54f1db52626267a3af53e25e9f22b Mon Sep 17 00:00:00 2001
From: gereon <gereon.kremer@rwth-aachen.de>
Date: Sun, 2 Dec 2012 00:22:36 +0100
Subject: [PATCH] integrated renaming within master branch into code merged
 from parser branch

---
 src/parser/readLabFile.h   | 2 +-
 src/parser/readTraFile.cpp | 6 +++---
 src/parser/readTraFile.h   | 4 ++--
 src/utility/utility.cpp    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/parser/readLabFile.h b/src/parser/readLabFile.h
index afd575f2d..103fe5570 100644
--- a/src/parser/readLabFile.h
+++ b/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"
 
 
diff --git a/src/parser/readTraFile.cpp b/src/parser/readTraFile.cpp
index 6130c9751..b288a0451 100644
--- a/src/parser/readTraFile.cpp
+++ b/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);
 
diff --git a/src/parser/readTraFile.h b/src/parser/readTraFile.h
index 2d74242a6..0f9617ba1 100644
--- a/src/parser/readTraFile.h
+++ b/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
diff --git a/src/utility/utility.cpp b/src/utility/utility.cpp
index c565f059f..da595bbe0 100644
--- a/src/utility/utility.cpp
+++ b/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();