cyclegraph: bugfix - graph reachability was reversed

[c11tester.git] / cyclegraph.cc

diff --git a/cyclegraph.cc b/cyclegraph.cc
index 324e01cc0312747e4b39ee4b6c37343cfd7d163f..c526af0f590266a825f698be60fb92c4354d1a9c 100644 (file)
--- a/cyclegraph.cc
+++ b/cyclegraph.cc
@@ -2,14 +2,15 @@
 #include "action.h"
 
 /** Initializes a CycleGraph object. */
-
 CycleGraph::CycleGraph() {
        hasCycles=false;
 }
 
-/** Returns the CycleNode for a given ModelAction. */
+CycleGraph::~CycleGraph() {
+}
 
-CycleNode * CycleGraph::getNode(ModelAction * action) {
+/** 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);
@@ -19,19 +20,17 @@ CycleNode * CycleGraph::getNode(ModelAction * action) {
 }
 
 /** Adds an edge between two ModelActions. */
-
-void CycleGraph::addEdge(ModelAction *from, ModelAction *to) {
+void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to) {
        CycleNode *fromnode=getNode(from);
        CycleNode *tonode=getNode(to);
        if (!hasCycles) {
                // Check for Cycles
-               hasCycles=checkReachable(fromnode, tonode);
+               hasCycles=checkReachable(tonode, fromnode);
        }
        fromnode->addEdge(tonode);
 }
 
 /** Checks whether the first CycleNode can reach the second one. */
-
 bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) {
        std::vector<CycleNode *> queue;
        HashTable<CycleNode *, CycleNode *, uintptr_t, 4> discovered;
@@ -61,19 +60,16 @@ bool CycleGraph::checkForCycles() {
 }
 
 /** Constructor for a CycleNode. */
-
-CycleNode::CycleNode(ModelAction *modelaction) {
+CycleNode::CycleNode(const ModelAction *modelaction) {
        action=modelaction;
 }
 
 /** Returns a vector of the edges from a CycleNode. */
-
 std::vector<CycleNode *> * CycleNode::getEdges() {
        return &edges;
 }
 
 /** Adds an edge to a CycleNode. */
-
 void CycleNode::addEdge(CycleNode * node) {
        edges.push_back(node);
 }