From 188c06d651c01f2d71049f5607c4051a26734655 Mon Sep 17 00:00:00 2001 From: dehnert Date: Tue, 20 Nov 2012 01:24:53 +0100 Subject: [PATCH] Fixed one of the methods in utility.cpp to adapt to the new notations. --- src/utility/utility.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/utility/utility.cpp b/src/utility/utility.cpp index 400733e79..656e51ac1 100644 --- a/src/utility/utility.cpp +++ b/src/utility/utility.cpp @@ -11,6 +11,7 @@ #include "src/sparse/static_sparse_matrix.h" #include "src/models/dtmc.h" +#include "src/models/atomic_propositions_labeling.h" namespace mrmc { @@ -77,16 +78,16 @@ void dtmcToDot(mrmc::models::Dtmc* dtmc, const char* filename) { } mrmc::models::Dtmc* parseDTMC(const char* tra_file, const char* lab_file) { -/* mrmc::sparse::StaticSparseMatrix* transition_matrix = + mrmc::sparse::StaticSparseMatrix* transition_matrix = mrmc::parser::read_tra_file(tra_file); uint_fast64_t node_count = transition_matrix->getRowCount(); - mrmc::dtmc::Labeling* labeling = + mrmc::models::AtomicPropositionsLabeling* labeling = mrmc::parser::read_lab_file(node_count, lab_file); mrmc::models::Dtmc* result = new mrmc::models::Dtmc(transition_matrix, labeling); - return result; */ + return result; } }