X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cyclegraph.cc;h=8788bfeba6c33140c0544a4ed39f8475864f3e8c;hb=1667e1f8017bd3f4bf5b1ef5712e3156577f99a2;hp=c1fea4f3d0a96f14de433b6aac8b61e6f6479131;hpb=1745637aab8a1d85eb605b9ef9e92d4fbb437633;p=model-checker.git diff --git a/cyclegraph.cc b/cyclegraph.cc index c1fea4f..8788bfe 100644 --- a/cyclegraph.cc +++ b/cyclegraph.cc @@ -1,4 +1,5 @@ #include "cyclegraph.h" +#include "action.h" CycleGraph::CycleGraph() { hasCycles=false; @@ -24,17 +25,17 @@ void CycleGraph::addEdge(ModelAction *from, ModelAction *to) { } bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) { - std::vector queue; - HashTable discovered; - + std::vector queue; + HashTable discovered; + queue.push_back(from); discovered.put(from, from); while(!queue.empty()) { - class CycleNode * node=queue.back(); + CycleNode * node=queue.back(); queue.pop_back(); if (node==to) return true; - + for(unsigned int i=0;igetEdges()->size();i++) { CycleNode *next=(*node->getEdges())[i]; if (!discovered.contains(next)) { @@ -50,7 +51,7 @@ CycleNode::CycleNode(ModelAction *modelaction) { action=modelaction; } -std::vector * CycleNode::getEdges() { +std::vector * CycleNode::getEdges() { return &edges; }