From a37c42d7dcf9c7f9a8b5216b091b7b92aabf3cb2 Mon Sep 17 00:00:00 2001 From: Jip Spel Date: Mon, 1 Oct 2018 13:43:57 +0200 Subject: [PATCH] Fix same name parameter --- src/storm-pars/analysis/MonotonicityChecker.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/storm-pars/analysis/MonotonicityChecker.cpp b/src/storm-pars/analysis/MonotonicityChecker.cpp index fa97cefc4..30ca4f110 100644 --- a/src/storm-pars/analysis/MonotonicityChecker.cpp +++ b/src/storm-pars/analysis/MonotonicityChecker.cpp @@ -12,7 +12,7 @@ namespace storm { std::map>> MonotonicityChecker::checkMonotonicity(std::map>> map, storm::storage::SparseMatrix matrix) { auto i = 0; std::map>> result; - for (auto itr = map.begin(); itr != map.end(); ++itr) { + for (auto itr = map.begin(); i < map.size() && itr != map.end(); ++itr) { auto lattice = itr->first; auto assumptions = itr->second; std::ofstream myfile; @@ -53,17 +53,18 @@ namespace storm { STORM_PRINT(" - Do not know if monotone decreasing in: " << itr2->first << std::endl); } } + result.insert(std::pair>>( + lattice, varsMonotone)); ++i; - result.insert(std::pair>>(lattice, varsMonotone)); } return result; } template - std::map> MonotonicityChecker::analyseMonotonicity(uint_fast64_t i, storm::analysis::Lattice* lattice, storm::storage::SparseMatrix matrix) { + std::map> MonotonicityChecker::analyseMonotonicity(uint_fast64_t j, storm::analysis::Lattice* lattice, storm::storage::SparseMatrix matrix) { std::map> varsMonotone; std::ofstream myfile; - std::string filename = "mc" + std::to_string(i) + ".dot"; + std::string filename = "mc" + std::to_string(j) + ".dot"; myfile.open (filename); myfile << "digraph \"MC\" {" << std::endl; myfile << "\t" << "node [shape=ellipse]" << std::endl; @@ -76,7 +77,6 @@ namespace storm { for (uint_fast64_t i = 0; i < matrix.getColumnCount(); ++i) { // go over all rows auto row = matrix.getRow(i); - auto first = (*row.begin()); if (first.getValue() != ValueType(1)) { std::map transitions; @@ -88,7 +88,8 @@ namespace storm { std::string color = ""; auto val = first.getValue(); auto vars = val.gatherVariables(); - for (auto itr = vars.begin(); itr != vars.end(); ++itr) { if (varsMonotone.find(*itr) == varsMonotone.end()) { + for (auto itr = vars.begin(); itr != vars.end(); ++itr) { + if (varsMonotone.find(*itr) == varsMonotone.end()) { varsMonotone[*itr].first = true; varsMonotone[*itr].second = true; } @@ -121,7 +122,6 @@ namespace storm { } } - if ((value->first != old.first) && (value->second != old.second)) { color = "color = red, "; } else if ((value->first != old.first)) {