projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cyclegraph: bugfix - graph reachability was reversed
[c11tester.git]
/
cyclegraph.cc
diff --git
a/cyclegraph.cc
b/cyclegraph.cc
index c1fea4f3d0a96f14de433b6aac8b61e6f6479131..c526af0f590266a825f698be60fb92c4354d1a9c 100644
(file)
--- a/
cyclegraph.cc
+++ b/
cyclegraph.cc
@@
-1,10
+1,16
@@
#include "cyclegraph.h"
#include "cyclegraph.h"
+#include "action.h"
+/** Initializes a CycleGraph object. */
CycleGraph::CycleGraph() {
hasCycles=false;
}
CycleGraph::CycleGraph() {
hasCycles=false;
}
-CycleNode * CycleGraph::getNode(ModelAction * action) {
+CycleGraph::~CycleGraph() {
+}
+
+/** Returns the CycleNode for a given ModelAction. */
+CycleNode * CycleGraph::getNode(const ModelAction * action) {
CycleNode *node=actionToNode.get(action);
if (node==NULL) {
node=new CycleNode(action);
CycleNode *node=actionToNode.get(action);
if (node==NULL) {
node=new CycleNode(action);
@@
-13,28
+19,30
@@
CycleNode * CycleGraph::getNode(ModelAction * action) {
return node;
}
return node;
}
-void CycleGraph::addEdge(ModelAction *from, ModelAction *to) {
+/** Adds an edge between two ModelActions. */
+void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to) {
CycleNode *fromnode=getNode(from);
CycleNode *tonode=getNode(to);
if (!hasCycles) {
// Check for Cycles
CycleNode *fromnode=getNode(from);
CycleNode *tonode=getNode(to);
if (!hasCycles) {
// Check for Cycles
- hasCycles=checkReachable(
fromnode, to
node);
+ hasCycles=checkReachable(
tonode, from
node);
}
fromnode->addEdge(tonode);
}
}
fromnode->addEdge(tonode);
}
+/** Checks whether the first CycleNode can reach the second one. */
bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) {
bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) {
- std::vector<
class
CycleNode *> queue;
- HashTable<
class CycleNode *, class
CycleNode *, uintptr_t, 4> discovered;
-
+ std::vector<CycleNode *> queue;
+ HashTable<
CycleNode *,
CycleNode *, uintptr_t, 4> discovered;
+
queue.push_back(from);
discovered.put(from, from);
while(!queue.empty()) {
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;
queue.pop_back();
if (node==to)
return true;
-
+
for(unsigned int i=0;i<node->getEdges()->size();i++) {
CycleNode *next=(*node->getEdges())[i];
if (!discovered.contains(next)) {
for(unsigned int i=0;i<node->getEdges()->size();i++) {
CycleNode *next=(*node->getEdges())[i];
if (!discovered.contains(next)) {
@@
-46,14
+54,22
@@
bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) {
return false;
}
return false;
}
-CycleNode::CycleNode(ModelAction *modelaction) {
+/** Returns whether a CycleGraph contains cycles. */
+bool CycleGraph::checkForCycles() {
+ return hasCycles;
+}
+
+/** Constructor for a CycleNode. */
+CycleNode::CycleNode(const ModelAction *modelaction) {
action=modelaction;
}
action=modelaction;
}
-std::vector<class CycleNode *> * CycleNode::getEdges() {
+/** Returns a vector of the edges from a CycleNode. */
+std::vector<CycleNode *> * CycleNode::getEdges() {
return &edges;
}
return &edges;
}
+/** Adds an edge to a CycleNode. */
void CycleNode::addEdge(CycleNode * node) {
edges.push_back(node);
}
void CycleNode::addEdge(CycleNode * node) {
edges.push_back(node);
}