cyclegraph: remove redundant code

The edgeCreatesCycle() function can simply be reduced to
checkReachable(), since checkReachable() will detect "to == from".

diff --git a/cyclegraph.cc b/cyclegraph.cc
index ec0ce45f55ae65ae77325889b0aa0bfe84444cf8..2dc2eae9503a92f1117be1345441242d3a8f1437 100644 (file)
--- a/cyclegraph.cc
+++ b/cyclegraph.cc
@@ -63,7 +63,7 @@ void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to)
        CycleNode *tonode = getNode(to);
 
        if (!hasCycles)
-               hasCycles = edgeCreatesCycle(fromnode, tonode);
+               hasCycles = checkReachable(tonode, fromnode);
 
        if (fromnode->addEdge(tonode))
                rollbackvector.push_back(fromnode);
@@ -81,7 +81,7 @@ void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to)
         */
        if (rmwnode != NULL && !to->is_rmw()) {
                if (!hasCycles)
-                       hasCycles = edgeCreatesCycle(rmwnode, tonode);
+                       hasCycles = checkReachable(tonode, rmwnode);
 
                if (rmwnode->addEdge(tonode))
                        rollbackvector.push_back(rmwnode);
@@ -124,7 +124,7 @@ void CycleGraph::addRMWEdge(const ModelAction *from, const ModelAction *rmw)
        }
 
        if (!hasCycles)
-               hasCycles = edgeCreatesCycle(fromnode, rmwnode);
+               hasCycles = checkReachable(rmwnode, fromnode);
 
        if (fromnode->addEdge(rmwnode))
                rollbackvector.push_back(fromnode);
@@ -160,18 +160,6 @@ void CycleGraph::dumpGraphToFile(const char *filename) const
 }
 #endif
 
-/**
- * Checks whether the addition of an edge between these two nodes would create
- * a cycle in the graph.
- * @param from The CycleNode from which the edge would start
- * @param to The CycleNode to which the edge would point
- * @return True if this edge would create a cycle; false otherwise
- */
-bool CycleGraph::edgeCreatesCycle(const CycleNode *from, const CycleNode *to) const
-{
-       return (from == to) || checkReachable(to, from);
-}
-
 /**
  * Checks whether one ModelAction can reach another.
  * @param from The ModelAction from which to begin exploration

diff --git a/cyclegraph.h b/cyclegraph.h
index 5d9c976b5a1c21ae22459ec9380ce3164f529ddd..45e49fb7bec3950656054e02f92b06aa5cf3ae65 100644 (file)
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -52,8 +52,6 @@ class CycleGraph {
 
        bool checkReachable(const CycleNode *from, const CycleNode *to) const;
 
-       bool edgeCreatesCycle(const CycleNode *from, const CycleNode *to) const;
-
        /** @brief A flag: true if this graph contains cycles */
        bool hasCycles;
        bool oldCycles;