Consider dependencies in DFS for state generation info

Former-commit-id: c61210cbd5

src/storage/dft/DFT.cpp

@@ -80,23 +80,17 @@ namespace storm {
             std::queue<size_t> visitQueue;
             std::set<size_t> visited;
             visitQueue.push(subTreeRoots[0]);
-            bool consideredDependencies = false;
+            stateIndex = performStateGenerationInfoDFS(generationInfo, visitQueue, visited, stateIndex);
-            while (true) {
+            // Consider dependencies
-                if (consideredDependencies) {
+            for (size_t idDependency : getDependencies()) {
-                    break;
+                std::shared_ptr<DFTDependency<ValueType> const> dependency = getDependency(idDependency);
-                }
+                visitQueue.push(dependency->id());
-                
+                visitQueue.push(dependency->triggerEvent()->id());
-                stateIndex = performStateGenerationInfoDFS(generationInfo, visitQueue, visited, stateIndex);
+                visitQueue.push(dependency->dependentEvent()->id());
-                
-                // Consider dependencies
-                for (size_t idDependency : getDependencies()) {
-                    std::shared_ptr<DFTDependency<ValueType> const> dependency = getDependency(idDependency);
-                    visitQueue.push(dependency->id());
-                    visitQueue.push(dependency->triggerEvent()->id());
-                    visitQueue.push(dependency->dependentEvent()->id());
-                }
-                consideredDependencies = true;
             }
+            stateIndex = performStateGenerationInfoDFS(generationInfo, visitQueue, visited, stateIndex);
+            
             assert(stateIndex = mStateVectorSize);
 
             STORM_LOG_TRACE(generationInfo);