Fix bug

diff --git a/src/AST/order.cc b/src/AST/order.cc
index e597e72ebbd1e2c598aba5277a93d9628378c60a..cdc3d52c9efdea7d98d21002dccc4a6e2b183745 100644 (file)
--- a/src/AST/order.cc
+++ b/src/AST/order.cc
@@ -12,7 +12,6 @@ Order::Order(OrderType _type, Set *_set) :
        graph(NULL),
        order(this)
 {
-       auxSet = new Set(_type,(uint64_t) 1,(uint64_t) _set->getSize());
 }
 
 void Order::initializeOrderHashTable() {

diff --git a/src/AST/order.h b/src/AST/order.h
index acd6426b973421037c6d83265f343e53cda88f33..164578630697960e54f045cff417ed3fc80b2736 100644 (file)
--- a/src/AST/order.h
+++ b/src/AST/order.h
@@ -14,7 +14,6 @@ class Order {
        ~Order();
        OrderType type;
        Set *set;
-       Set* auxSet;
        HashTableOrderPair *orderPairTable;
        HashSetOrderElement* elementTable;
        OrderGraph *graph;

diff --git a/src/ASTAnalyses/ordergraph.cc b/src/ASTAnalyses/ordergraph.cc
index 7e26d74a5a76b645cd33174bfb2403009658f7d3..ee970e1d551c1f3281e541a092c318f57f33cc79 100644 (file)
--- a/src/ASTAnalyses/ordergraph.cc
+++ b/src/ASTAnalyses/ordergraph.cc
@@ -10,7 +10,6 @@ OrderGraph *allocOrderGraph(Order *order) {
        This->nodes = new HashSetOrderNode();
        This->edges = new HashSetOrderEdge();
        This->order = order;
-       order->graph = This;
        return This;
 }
 

diff --git a/src/ASTTransform/integerencoding.cc b/src/ASTTransform/integerencoding.cc
index f4b17b4eae2c1f5e1a08ac1d6a3edc0bbd33025f..a3262330f238519514fefbdc8a86b3c045e16e9d 100644 (file)
--- a/src/ASTTransform/integerencoding.cc
+++ b/src/ASTTransform/integerencoding.cc
@@ -5,7 +5,7 @@
 #include "csolver.h"
 #include "predicate.h"
 #include "element.h"
-
+/*
 void orderIntegerEncodingSATEncoder(SATEncoder *This, BooleanOrder *boolOrder){
        Order* order = boolOrder->order;
        if (order->elementTable == NULL) {
@@ -39,3 +39,4 @@ Element* getOrderIntegerElement(SATEncoder* This,Order *order, uint64_t item) {
                return eset->get(&oelement)->elem;
 }
 
+*/

diff --git a/src/ASTTransform/orderdecompose.cc b/src/ASTTransform/orderdecompose.cc
index 59b6ebc600a4737d02e1937fa2fe62e176e2b5f1..2effff5e29e3c8f7e8cedf3cb1360483a48fbdcc 100644 (file)
--- a/src/ASTTransform/orderdecompose.cc
+++ b/src/ASTTransform/orderdecompose.cc
@@ -85,6 +85,7 @@ void decomposeOrder(CSolver *This, Order *order, OrderGraph *graph) {
                                neworder = ordervec.get(from->sccNum);
                        if (neworder == NULL) {
                                MutableSet *set = new MutableSet(order->set->type);
+                               This->allSets.push(set);
                                neworder = new Order(order->type, set);
                                This->allOrders.push(neworder);
                                ordervec.setExpand(from->sccNum, neworder);