From e632fc1bb61fa48ce9d429355d14bb465341c7ab Mon Sep 17 00:00:00 2001 From: gereon Date: Mon, 26 Nov 2012 23:21:59 +0100 Subject: [PATCH 1/3] fixing error & warning... --- src/models/AtomicPropositionsLabeling.h | 2 +- src/utility/utility.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/models/AtomicPropositionsLabeling.h b/src/models/AtomicPropositionsLabeling.h index 30900f0c3..f7d0e28e6 100644 --- a/src/models/AtomicPropositionsLabeling.h +++ b/src/models/AtomicPropositionsLabeling.h @@ -188,7 +188,7 @@ public: << this->singleLabelings[ap.second]->getNumberOfSetBits(); out << " state(s)" << std::endl; } - for(int i = 0; i < apCountMax; ++i) { + for(unsigned 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; diff --git a/src/utility/utility.h b/src/utility/utility.h index 464ccecb6..65eb9113f 100644 --- a/src/utility/utility.h +++ b/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 { From c634ff6d0b95c712c14746ba4f458605542b695c Mon Sep 17 00:00:00 2001 From: dehnert Date: Tue, 27 Nov 2012 10:08:46 +0100 Subject: [PATCH 2/3] Removed debug output. --- src/models/AtomicPropositionsLabeling.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/models/AtomicPropositionsLabeling.h b/src/models/AtomicPropositionsLabeling.h index f7d0e28e6..a88f285aa 100644 --- a/src/models/AtomicPropositionsLabeling.h +++ b/src/models/AtomicPropositionsLabeling.h @@ -188,12 +188,6 @@ public: << this->singleLabelings[ap.second]->getNumberOfSetBits(); out << " state(s)" << std::endl; } - for(unsigned 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: From aaa5ccada8372694a92f2abdeae0009999143cce Mon Sep 17 00:00:00 2001 From: dehnert Date: Tue, 27 Nov 2012 19:54:40 +0100 Subject: [PATCH 3/3] Added command line arguments to MRMC to log output. --- src/mrmc.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/mrmc.cpp b/src/mrmc.cpp index 269e01d9a..5402cab10 100644 --- a/src/mrmc.cpp +++ b/src/mrmc.cpp @@ -14,6 +14,7 @@ #include #include +#include #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; }