X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=src%2FASTAnalyses%2FOrder%2Fordergraph.cc;h=57d0db8c756fc5f28a8333f7b83e61cbcb6e59be;hb=bdb737849a5e0a2620e049dabfc0ba01f4ab23bb;hp=85a020789be949c0fca91c23d835a7f0cb55bcdb;hpb=45bda60d0c548e27157100efb7855f45a5104606;p=satune.git

diff --git a/src/ASTAnalyses/Order/ordergraph.cc b/src/ASTAnalyses/Order/ordergraph.cc
index 85a0207..57d0db8 100644
--- a/src/ASTAnalyses/Order/ordergraph.cc
+++ b/src/ASTAnalyses/Order/ordergraph.cc
@@ -12,9 +12,10 @@ OrderGraph::OrderGraph(Order *_order) :
 OrderGraph *buildOrderGraph(Order *order) {
 	ASSERT(order->graph == NULL);
 	OrderGraph *orderGraph = new OrderGraph(order);
-	uint constrSize = order->constraints.getSize();
+	Vector<BooleanOrder *> *constraints = order->getConstraints();
+	uint constrSize = constraints->getSize();
 	for (uint j = 0; j < constrSize; j++) {
-		orderGraph->addOrderConstraintToOrderGraph(order->constraints.get(j));
+		orderGraph->addOrderConstraintToOrderGraph(constraints->get(j));
 	}
 	return orderGraph;
 }
@@ -23,9 +24,10 @@ OrderGraph *buildOrderGraph(Order *order) {
 OrderGraph *buildMustOrderGraph(Order *order) {
 	ASSERT(order->graph == NULL);
 	OrderGraph *orderGraph = new OrderGraph(order);
-	uint constrSize = order->constraints.getSize();
+	Vector<BooleanOrder *> *constraints = order->getConstraints();
+	uint constrSize = constraints->getSize();
 	for (uint j = 0; j < constrSize; j++) {
-		orderGraph->addMustOrderConstraintToOrderGraph(order->constraints.get(j));
+		orderGraph->addMustOrderConstraintToOrderGraph(constraints->get(j));
 	}
 	return orderGraph;
 }
@@ -117,7 +119,7 @@ void OrderGraph::addMustOrderEdge(OrderNode *node1, OrderNode *node2, BooleanOrd
 
 OrderNode *OrderGraph::getOrderNodeFromOrderGraph(uint64_t id) {
 	OrderNode *node = new OrderNode(id);
-	OrderNode *tmp = nodes.get(node);
+	OrderNode *tmp = (OrderNode *)nodes.get(node);
 	if ( tmp != NULL) {
 		delete node;
 		node = tmp;
@@ -128,8 +130,8 @@ OrderNode *OrderGraph::getOrderNodeFromOrderGraph(uint64_t id) {
 }
 
 OrderNode *OrderGraph::lookupOrderNodeFromOrderGraph(uint64_t id) {
-	OrderNode node(id);
-	OrderNode *tmp = nodes.get(&node);
+	OrderNodeKey node(id);
+	OrderNode *tmp = (OrderNode *)nodes.get(&node);
 	return tmp;
 }
 
@@ -225,7 +227,7 @@ bool OrderGraph::isTherePathVisit(HashsetOrderNode &visited, OrderNode *current,
 void OrderGraph::DFS(Vector<OrderNode *> *finishNodes) {
 	SetIteratorOrderNode *iterator = getNodes();
 	while (iterator->hasNext()) {
-		OrderNode *node = iterator->next();
+		OrderNode *node = (OrderNode *)iterator->next();
 		if (node->status == NOTVISITED && !node->removed) {
 			node->status = VISITED;
 			DFSNodeVisit(node, finishNodes, false, false, 0);
@@ -239,7 +241,7 @@ void OrderGraph::DFS(Vector<OrderNode *> *finishNodes) {
 void OrderGraph::DFSMust(Vector<OrderNode *> *finishNodes) {
 	SetIteratorOrderNode *iterator = getNodes();
 	while (iterator->hasNext()) {
-		OrderNode *node = iterator->next();
+		OrderNode *node = (OrderNode *)iterator->next();
 		if (node->status == NOTVISITED && !node->removed) {
 			node->status = VISITED;
 			DFSNodeVisit(node, finishNodes, false, true, 0);
@@ -294,7 +296,7 @@ void OrderGraph::DFSNodeVisit(OrderNode *node, Vector<OrderNode *> *finishNodes,
 void OrderGraph::resetNodeInfoStatusSCC() {
 	SetIteratorOrderNode *iterator = getNodes();
 	while (iterator->hasNext()) {
-		iterator->next()->status = NOTVISITED;
+		((OrderNode *)iterator->next())->status = NOTVISITED;
 	}
 	delete iterator;
 }