From ef03284369a09a2a110b7ac93dd46fd24f39ec26 Mon Sep 17 00:00:00 2001 From: Lanchid Date: Wed, 19 Dec 2012 20:37:29 +0100 Subject: [PATCH] Changed mrmc.cpp to use the new Dtmc parser instead of the separate ones. --- src/mrmc.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/mrmc.cpp b/src/mrmc.cpp index b107844ef..ad5486cc9 100644 --- a/src/mrmc.cpp +++ b/src/mrmc.cpp @@ -24,8 +24,7 @@ #include "src/models/AtomicPropositionsLabeling.h" #include "src/modelChecker/EigenDtmcPrctlModelChecker.h" #include "src/modelChecker/GmmxxDtmcPrctlModelChecker.h" -#include "src/parser/AtomicPropositionLabelingParser.h" -#include "src/parser/DeterministicSparseTransitionParser.h" +#include "src/parser/DtmcParser.h" #include "src/parser/PrctlParser.h" #include "src/solver/GraphAnalyzer.h" #include "src/utility/Settings.h" @@ -101,11 +100,10 @@ int main(const int argc, const char* argv[]) { LOG4CPLUS_INFO(logger, "Enable verbose mode, log output gets printed to console."); } - mrmc::parser::DeterministicSparseTransitionParser traparser(s->getString("trafile")); - mrmc::parser::AtomicPropositionLabelingParser labparser(traparser.getMatrix()->getRowCount(), s->getString("labfile")); - mrmc::models::Dtmc dtmc(traparser.getMatrix(), labparser.getLabeling()); + mrmc::parser::DtmcParser dtmcParser(s->getString("trafile"), s->getString("labfile")); + std::shared_ptr> dtmc = dtmcParser.getDtmc(); - dtmc.printModelInformationToStream(std::cout); + dtmc->printModelInformationToStream(std::cout); if (s != nullptr) { delete s;