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

src/models/AtomicPropositionsLabeling.h

@@ -188,12 +188,6 @@ public:
 				<< this->singleLabelings[ap.second]->getNumberOfSetBits();
 			out << " state(s)" << std::endl;
 		}
-		for(int i = 0; i < apCountMax; ++i) {
-			std::cout << "iterator " << i << std::endl;
-			for(auto it = this->singleLabelings[i]->begin(); it != this->singleLabelings[i]->end(); ++it) {
-				out << "next value: " << *it << std::endl;
-			}
-		}
 	}
 
 private:

src/mrmc.cpp

@@ -14,6 +14,7 @@
 
 #include <iostream>
 #include <cstdio>
+#include <sstream>
 
 #include "mrmc-config.h"
 #include "src/models/Dtmc.h"
@@ -55,7 +56,14 @@ int main(const int argc, const char* argv[]) {
 
 	mrmc::settings::Settings* s = NULL;
 	
-	LOG4CPLUS_INFO(logger, "This is the Markov Reward Model Checker (MRMC) by i2 of RWTH Aachen university.");
+	LOG4CPLUS_INFO(logger, "This is the Markov Reward Model Checker (MRMC) by i2 of RWTH Aachen University.");
+
+	// "Compute" the command line argument string with which MRMC was invoked and log as diagnostic information.
+	std::stringstream commandStream;
+	for (int i = 0; i < argc; ++i) {
+		commandStream << argv[i] << " ";
+	}
+	LOG4CPLUS_INFO(logger, "MRMC command invoked " << commandStream.str());
 
 	try {
 		s = mrmc::settings::Settings::instance(argc, argv, nullptr);
@@ -66,13 +74,11 @@ int main(const int argc, const char* argv[]) {
 		return 1;
 	}
 	
-	if (s->isSet("help"))
-	{
+	if (s->isSet("help")) {
 		std::cout << mrmc::settings::help << std::endl;
 		return 0;
 	}
-	if (s->isSet("help-config"))
-	{
+	if (s->isSet("help-config")) {
 		std::cout << mrmc::settings::helpConfigfile << std::endl;
 		return 0;
 	}

src/utility/utility.h

@@ -8,7 +8,7 @@
 #ifndef UTILITY_H_
 #define UTILITY_H_
 
-#include "src/models/dtmc.h"
+#include "src/models/Dtmc.h"
 
 namespace mrmc  {