X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cyclegraph.h;h=bb2ab2d87b4370065ff64fa9dfcac45e86f2ce39;hb=dc9c89654982c64264dfee7b1ea23e9a5e88e18e;hp=a9e46120f1f3efac17efacb9a608abca451868d4;hpb=5d0c8be1e7d652a85d36827074f4c72661e7457f;p=model-checker.git

diff --git a/cyclegraph.h b/cyclegraph.h
index a9e4612..bb2ab2d 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -28,7 +28,7 @@ class CycleGraph {
 	~CycleGraph();
 
 	template <typename T, typename U>
-	bool addEdge(const T from, const U to);
+	bool addEdge(const T *from, const U *to);
 
 	template <typename T>
 	void addRMWEdge(const T *from, const ModelAction *rmw);
@@ -36,8 +36,8 @@ class CycleGraph {
 	bool checkForCycles() const;
 	bool checkPromise(const ModelAction *from, Promise *p) const;
 
-	template <typename T>
-	bool checkReachable(const ModelAction *from, const T *to) const;
+	template <typename T, typename U>
+	bool checkReachable(const T *from, const U *to) const;
 
 	void startChanges();
 	void commitChanges();
@@ -54,6 +54,8 @@ class CycleGraph {
  private:
 	bool addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
 	void putNode(const ModelAction *act, CycleNode *node);
+	void putNode(const Promise *promise, CycleNode *node);
+	void erasePromiseNode(const Promise *promise);
 	CycleNode * getNode(const ModelAction *act);
 	CycleNode * getNode(const Promise *promise);
 	CycleNode * getNode_noCreate(const ModelAction *act) const;
@@ -127,47 +129,4 @@ class CycleNode {
 	CycleNode *hasRMW;
 };
 
-/*
- * @brief Adds an edge between objects
- *
- * This function will add an edge between any two objects which can be
- * associated with a CycleNode. That is, if they have a CycleGraph::getNode
- * implementation.
- *
- * The object to is ordered after the object from.
- *
- * @param to The edge points to this object, of type T
- * @param from The edge comes from this object, of type U
- * @return True, if new edge(s) are added; otherwise false
- */
-template <typename T, typename U>
-bool CycleGraph::addEdge(const T from, const U to)
-{
-	ASSERT(from);
-	ASSERT(to);
-
-	CycleNode *fromnode = getNode(from);
-	CycleNode *tonode = getNode(to);
-
-	return addNodeEdge(fromnode, tonode);
-}
-
-/**
- * Checks whether one ModelAction can reach another ModelAction/Promise
- * @param from The ModelAction from which to begin exploration
- * @param to The ModelAction or Promise to reach
- * @return True, @a from can reach @a to; otherwise, false
- */
-template <typename T>
-bool CycleGraph::checkReachable(const ModelAction *from, const T *to) const
-{
-	CycleNode *fromnode = getNode_noCreate(from);
-	CycleNode *tonode = getNode_noCreate(to);
-
-	if (!fromnode || !tonode)
-		return false;
-
-	return checkReachable(fromnode, tonode);
-}
-
 #endif /* __CYCLEGRAPH_H__ */