X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=cyclegraph.cc;h=c526af0f590266a825f698be60fb92c4354d1a9c;hp=c1fea4f3d0a96f14de433b6aac8b61e6f6479131;hb=7abd49a94a2096b0dbed4403ba4397b3ee96422b;hpb=857205edf46f2daefe0b6e471b902fcfd9c67df2

diff --git a/cyclegraph.cc b/cyclegraph.cc
index c1fea4f3..c526af0f 100644
--- a/cyclegraph.cc
+++ b/cyclegraph.cc
@@ -1,10 +1,16 @@
 #include "cyclegraph.h"
+#include "action.h"
 
+/** Initializes a CycleGraph object. */
 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);
@@ -13,28 +19,30 @@ CycleNode * CycleGraph::getNode(ModelAction * action) {
 	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
-		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<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()) {
-		class CycleNode * node=queue.back();
+		CycleNode * node=queue.back();
 		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)) {
@@ -46,14 +54,22 @@ bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) {
 	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;
 }
 
-std::vector<class CycleNode *> * CycleNode::getEdges() {
+/** 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);
 }