From aee63dcf31e2c2923c606f7da99d1eff9dba63ac Mon Sep 17 00:00:00 2001 From: dehnert Date: Thu, 14 Mar 2013 08:52:37 +0100 Subject: [PATCH] Made the SCC generation during decomposition optional. --- src/utility/GraphAnalyzer.h | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/utility/GraphAnalyzer.h b/src/utility/GraphAnalyzer.h index 59c5deb03..eeb619a6c 100644 --- a/src/utility/GraphAnalyzer.h +++ b/src/utility/GraphAnalyzer.h @@ -417,21 +417,22 @@ public: } template - static uint_fast64_t performSccDecomposition(storm::models::AbstractNondeterministicModel& model, std::vector>& stronglyConnectedComponents) { - LOG4CPLUS_INFO(logger, "Computing SCC decomposition..."); + static uint_fast64_t performSccDecomposition(storm::models::AbstractNondeterministicModel& model, std::vector*>* stronglyConnectedComponents) { + LOG4CPLUS_INFO(logger, "Computing SCC decomposition."); // Get the forward transition relation from the model to ease the search. storm::models::GraphTransitions forwardTransitions(model.getTransitionMatrix(), model.getNondeterministicChoiceIndices(), true); // Perform the actual SCC decomposition based on the graph-transitions of the system. - performSccDecomposition(model.getNumberOfStates(), model.getLabeledStates("init"), forwardTransitions, stronglyConnectedComponents); + uint_fast64_t result = performSccDecomposition(model.getNumberOfStates(), *model.getLabeledStates("init"), forwardTransitions, stronglyConnectedComponents); - LOG4CPLUS_INFO(logger, "Done computing SCCs."); + LOG4CPLUS_INFO(logger, "Done computing SCC decomposition."); + return result; } private: template - static uint_fast64_t performSccDecomposition(uint_fast64_t numberOfStates, storm::storage::BitVector const* const initialStates, storm::models::GraphTransitions const& forwardTransitions, std::vector>& stronglyConnectedComponents) { + static uint_fast64_t performSccDecomposition(uint_fast64_t numberOfStates, storm::storage::BitVector const& initialStates, storm::models::GraphTransitions const& forwardTransitions, std::vector*>* stronglyConnectedComponents) { std::vector tarjanStack; tarjanStack.reserve(numberOfStates); storm::storage::BitVector tarjanStackStates(numberOfStates); @@ -441,17 +442,17 @@ private: storm::storage::BitVector visitedStates(numberOfStates); uint_fast64_t currentIndex = 0; - for (auto state : *initialStates) { + for (auto state : initialStates) { if (!visitedStates.get(state)) { performSccDecompositionHelper(state, currentIndex, stateIndices, lowlinks, tarjanStack, tarjanStackStates, visitedStates, forwardTransitions, stronglyConnectedComponents); } } - return stronglyConnectedComponents.size(); + return stronglyConnectedComponents->size(); } template - static void performSccDecompositionHelper(uint_fast64_t startState, uint_fast64_t& currentIndex, std::vector& stateIndices, std::vector& lowlinks, std::vector& tarjanStack, storm::storage::BitVector& tarjanStackStates, storm::storage::BitVector& visitedStates, storm::models::GraphTransitions& forwardTransitions, std::vector>& stronglyConnectedComponents) { + static void performSccDecompositionHelper(uint_fast64_t startState, uint_fast64_t& currentIndex, std::vector& stateIndices, std::vector& lowlinks, std::vector& tarjanStack, storm::storage::BitVector& tarjanStackStates, storm::storage::BitVector& visitedStates, storm::models::GraphTransitions const& forwardTransitions, std::vector*>* stronglyConnectedComponents) { // Create the stacks needed for turning the recursive formulation of Tarjan's algorithm // into an iterative version. In particular, we keep one stack for states and one stack // for the iterators. The last one is not strictly needed, but reduces iteration work when @@ -507,7 +508,9 @@ private: // If the current state is the root of a SCC, we need to pop all states of the SCC from // the algorithm's stack. if (lowlinks[currentState] == stateIndices[currentState]) { - stronglyConnectedComponents.push_back(std::vector()); + if (stronglyConnectedComponents != nullptr) { + stronglyConnectedComponents->push_back(new std::vector()); + } uint_fast64_t lastState = 0; do { @@ -516,8 +519,10 @@ private: tarjanStack.pop_back(); tarjanStackStates.set(lastState, false); - // Add the state to the current SCC. - stronglyConnectedComponents.back().push_back(lastState); + if (stronglyConnectedComponents != nullptr) { + // Add the state to the current SCC. + stronglyConnectedComponents->back()->push_back(lastState); + } } while (lastState != currentState); }