From 8ad7f06bce310a9811da90f8334acf610a3ee1d1 Mon Sep 17 00:00:00 2001 From: bdemsky Date: Fri, 25 Aug 2017 16:24:59 -0700 Subject: [PATCH] Fix bug --- src/AST/order.cc | 1 - src/AST/order.h | 1 - src/ASTAnalyses/ordergraph.cc | 1 - src/ASTTransform/integerencoding.cc | 3 ++- src/ASTTransform/orderdecompose.cc | 1 + 5 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/AST/order.cc b/src/AST/order.cc index e597e72..cdc3d52 100644 --- 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 acd6426..1645786 100644 --- 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 7e26d74..ee970e1 100644 --- 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 f4b17b4..a326233 100644 --- 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 59b6ebc..2effff5 100644 --- 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); -- 2.34.1