From ea8504a84e670642d3aa177b03cb167375e5a280 Mon Sep 17 00:00:00 2001
From: gereon <gereon.kremer@rwth-aachen.de>
Date: Wed, 21 Nov 2012 20:55:06 +0100
Subject: [PATCH] some fixes to new parser, calculate maximum node number
 manually

---
 src/parser/readLabFile.cpp | 13 ++++++++-----
 src/parser/readTraFile.cpp | 17 ++++++++++-------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/parser/readLabFile.cpp b/src/parser/readLabFile.cpp
index 15b66aaba..5fa97a0d3 100644
--- a/src/parser/readLabFile.cpp
+++ b/src/parser/readLabFile.cpp
@@ -60,6 +60,7 @@ mrmc::models::AtomicPropositionsLabeling * readLabFile(int node_count, const cha
 		else cnt = 1;
 	} while (cnt > 0);
 	
+	printf("node count %d\n", node_count);
 	mrmc::models::AtomicPropositionsLabeling* result = new mrmc::models::AtomicPropositionsLabeling(node_count, proposition_count);
 	char proposition[128];
 	buf = file.data;
@@ -79,18 +80,20 @@ mrmc::models::AtomicPropositionsLabeling * readLabFile(int node_count, const cha
 	buf += 4;
 	
 	uint_fast32_t node;
-	while (1) {
+	do {
 		node = strtol(buf, &buf, 10);
 		while (*buf != '\0') {
 			cnt = strcspn(buf, sep);
 			if (cnt == 0) buf++;
 			else break;
 		}
-		strncpy(proposition, buf, cnt);
-		proposition[cnt] = '\0';
-		result->addAtomicPropositionToState(proposition, node);
+		if (cnt > 0) {
+			strncpy(proposition, buf, cnt);
+			proposition[cnt] = '\0';
+			result->addAtomicPropositionToState(proposition, node);
+		}
 		buf += cnt;
-	}
+	} while (cnt > 0);
 	
 	return result;
 }
diff --git a/src/parser/readTraFile.cpp b/src/parser/readTraFile.cpp
index c11dfdf9a..032ff0214 100644
--- a/src/parser/readTraFile.cpp
+++ b/src/parser/readTraFile.cpp
@@ -52,7 +52,7 @@ char* skipWS(char* buf)
  * @return The number of non-zero elements that are not on the diagonal
  * @param buf Data to scan. Is expected to be some char array.
  */
-static uint_fast32_t makeFirstPass(char* buf)
+static uint_fast32_t makeFirstPass(char* buf, uint_fast32_t &maxnode)
 {
 	uint_fast32_t non_zero = 0;
 	
@@ -70,12 +70,15 @@ static uint_fast32_t makeFirstPass(char* buf)
 	/*!
 	 *	check all transitions for non-zero diagonal entrys
 	 */
-	unsigned int row, col;
+	uint_fast32_t row, col;
 	double val;
+	maxnode = 0;
 	while (1)  
 	{
 		row = strtol(buf, &buf, 10);
+		if (row > maxnode) maxnode = row;
 		col = strtol(buf, &buf, 10);
+		if (col > maxnode) maxnode = col;
 		val = strtod(buf, &buf);
 		if (val == 0.0) break;
 		if (row == col) non_zero--;
@@ -104,7 +107,8 @@ sparse::StaticSparseMatrix<double> * readTraFile(const char * filename) {
 	/*!
 	 *	perform first pass, i.e. count entries that are not zero and not on the diagonal
 	 */
-	uint_fast32_t non_zero = makeFirstPass(file.data);
+	uint_fast32_t maxnode;
+	uint_fast32_t non_zero = makeFirstPass(file.data, maxnode);
 	if (non_zero == 0)
 	{
 		/*!
@@ -120,20 +124,19 @@ sparse::StaticSparseMatrix<double> * readTraFile(const char * filename) {
 	 *	from here on, we already know that the file header is correct
 	 */
 	char* buf = file.data;
-	uint_fast32_t rows;
 	sparse::StaticSparseMatrix<double> *sp = NULL;
 
 	/*!
 	 *	read file header, extract number of states
 	 */
 	buf += 7; // skip "STATES "
-	rows = strtol(buf, &buf, 10);
+	strtol(buf, &buf, 10);
 	buf = skipWS(buf);
 	buf += 12; // skip "TRANSITIONS "
 	strtol(buf, &buf, 10);
 	
 	pantheios::log_DEBUG("Creating matrix with ",
-                        pantheios::integer(rows), " rows and ",
+                        pantheios::integer(maxnode + 1), " maxnodes and ",
                         pantheios::integer(non_zero), " Non-Zero-Elements");
                         
 	/*!	
@@ -141,7 +144,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>(rows);
+	sp = new sparse::StaticSparseMatrix<double>(maxnode + 1);
 	if (sp == NULL)
 	{
 		/*!