Renaming

[satune.git] / src / ASTAnalyses / ordergraph.cc

diff --git a/src/ASTAnalyses/ordergraph.cc b/src/ASTAnalyses/ordergraph.cc
index 9942b740fec5ee4841fd351de943231aa94f1528..c0df7a54d87196e67f5011fe8ab40e1f25aad2a9 100644 (file)
--- a/src/ASTAnalyses/ordergraph.cc
+++ b/src/ASTAnalyses/ordergraph.cc
@@ -46,7 +46,7 @@ void OrderGraph::addOrderEdge(OrderNode *node1, OrderNode *node2, BooleanOrder *
                        break;
        }
        case P_FALSE: {
-               if (order->type == TOTAL) {
+               if (order->type == SATC_TOTAL) {
                        OrderEdge *_2to1 = getOrderEdgeFromOrderGraph( node2, node1);
                        if (mustval == BV_MUSTBEFALSE || mustval == BV_UNSAT)
                                _2to1->mustPos = true;
@@ -83,7 +83,7 @@ void OrderGraph::addMustOrderEdge(OrderNode *node1, OrderNode *node2, BooleanOrd
                        break;
        }
        case BV_MUSTBEFALSE: {
-               if (order->type == TOTAL) {
+               if (order->type == SATC_TOTAL) {
                        OrderEdge *_2to1 = getOrderEdgeFromOrderGraph(node2, node1);
                        _2to1->mustPos = true;
                        _2to1->polPos = true;
@@ -159,14 +159,14 @@ void OrderGraph::addMustOrderConstraintToOrderGraph(BooleanOrder *bOrder) {
 }
 
 OrderGraph::~OrderGraph() {
-       HSIteratorOrderNode *iterator = nodes->iterator();
+       SetIteratorOrderNode *iterator = nodes->iterator();
        while (iterator->hasNext()) {
                OrderNode *node = iterator->next();
                delete node;
        }
        delete iterator;
 
-       HSIteratorOrderEdge *eiterator = edges->iterator();
+       SetIteratorOrderEdge *eiterator = edges->iterator();
        while (eiterator->hasNext()) {
                OrderEdge *edge = eiterator->next();
                delete edge;