From 084bc26a5f93315a77506cb6f4a1dd6e0e9e5239 Mon Sep 17 00:00:00 2001 From: sjunges Date: Wed, 24 Feb 2016 16:34:44 +0100 Subject: [PATCH] fixed some things with respect to SEQs Former-commit-id: 8460c4b5a59f86f4e195248704f1a08384744c63 --- src/storage/dft/DFT.cpp | 1 + src/storage/dft/DFTBuilder.cpp | 3 +-- src/storage/dft/DFTElements.cpp | 1 + src/storage/dft/DFTIsomorphism.h | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/storage/dft/DFT.cpp b/src/storage/dft/DFT.cpp index eef83928d..3d2b09088 100644 --- a/src/storage/dft/DFT.cpp +++ b/src/storage/dft/DFT.cpp @@ -333,6 +333,7 @@ namespace storm { for(auto it1 = colourClass.second.cbegin(); it1 != colourClass.second.cend(); ++it1) { std::vector> symClass; if(foundEqClassFor.count(*it1) > 0) { + // This item is already in a class. continue; } if(!getGate(*it1)->hasOnlyStaticParents()) { diff --git a/src/storage/dft/DFTBuilder.cpp b/src/storage/dft/DFTBuilder.cpp index 213fce0df..5e5c3da84 100644 --- a/src/storage/dft/DFTBuilder.cpp +++ b/src/storage/dft/DFTBuilder.cpp @@ -116,8 +116,7 @@ namespace storm { DFTRestrictionPointer restr; switch (tp) { case DFTElementType::SEQ: - restr = std::make_shared> - (mNextId++, name); + restr = std::make_shared>(mNextId++, name); break; case DFTElementType::MUTEX: STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "Gate type not supported."); diff --git a/src/storage/dft/DFTElements.cpp b/src/storage/dft/DFTElements.cpp index 81c78ccc6..f11f0b99f 100644 --- a/src/storage/dft/DFTElements.cpp +++ b/src/storage/dft/DFTElements.cpp @@ -1,6 +1,7 @@ #include #include #include "DFTElements.h" +#include "elements/DFTRestriction.h" namespace storm { namespace storage { diff --git a/src/storage/dft/DFTIsomorphism.h b/src/storage/dft/DFTIsomorphism.h index 0d5590d3d..498170368 100644 --- a/src/storage/dft/DFTIsomorphism.h +++ b/src/storage/dft/DFTIsomorphism.h @@ -207,6 +207,7 @@ namespace storage { } void colourize(std::shared_ptr> const& gate) { + std::cout << "Colour " << gate->id() << ": " << gate->type() << " " << gate->nrChildren() << " " << gate->rank() << "." << std::endl; gateColour[gate->id()] = gateColourizer(gate->type(), gate->nrChildren(), gate->nrParents(), 0, gate->rank()); }