Found bug... Don't update parent's list until we know we aren't going to be freed

[satune.git] / src / Backend / satorderencoder.cc

diff --git a/src/Backend/satorderencoder.cc b/src/Backend/satorderencoder.cc
index 750be42a73d954bd53d57fbc945850393954a57e..b977efa782c4ea963f03a4a3da6bbeac80b8da01 100644 (file)
--- a/src/Backend/satorderencoder.cc
+++ b/src/Backend/satorderencoder.cc
@@ -12,12 +12,13 @@
 #include "element.h"
 #include "predicate.h"
 #include "orderelement.h"
+#include "orderpairresolver.h"
 
 Edge SATEncoder::encodeOrderSATEncoder(BooleanOrder *constraint) {
        switch ( constraint->order->type) {
-       case PARTIAL:
+       case SATC_PARTIAL:
                return encodePartialOrderSATEncoder(constraint);
-       case TOTAL:
+       case SATC_TOTAL:
                return encodeTotalOrderSATEncoder(constraint);
        default:
                ASSERT(0);
@@ -25,7 +26,7 @@ Edge SATEncoder::encodeOrderSATEncoder(BooleanOrder *constraint) {
        return E_BOGUS;
 }
 
-Edge inferOrderConstraintFromGraph(Order *order, uint64_t _first, uint64_t _second) {
+Edge SATEncoder::inferOrderConstraintFromGraph(Order *order, uint64_t _first, uint64_t _second) {
        if (order->graph != NULL) {
                OrderGraph *graph = order->graph;
                OrderNode *first = graph->lookupOrderNodeFromOrderGraph(_first);
@@ -55,7 +56,7 @@ Edge SATEncoder::getPairConstraint(Order *order, OrderPair *pair) {
        if (!edgeIsNull(gvalue))
                return gvalue;
 
-       HashTableOrderPair *table = order->orderPairTable;
+       HashtableOrderPair *table = order->orderPairTable;
        bool negate = false;
        OrderPair flipped;
        if (pair->first < pair->second) {
@@ -76,9 +77,11 @@ Edge SATEncoder::getPairConstraint(Order *order, OrderPair *pair) {
 }
 
 Edge SATEncoder::encodeTotalOrderSATEncoder(BooleanOrder *boolOrder) {
-       ASSERT(boolOrder->order->type == TOTAL);
+       ASSERT(boolOrder->order->type == SATC_TOTAL);
        if (boolOrder->order->orderPairTable == NULL) {
-               boolOrder->order->initializeOrderHashTable();
+               //This is pairwised encoding ...
+               boolOrder->order->setOrderResolver(new OrderPairResolver(solver, boolOrder->order));
+               boolOrder->order->initializeOrderHashtable();
                bool doOptOrderStructure = GETVARTUNABLE(solver->getTuner(), boolOrder->order->type, OPTIMIZEORDERSTRUCTURE, &onoff);
                if (doOptOrderStructure) {
                        boolOrder->order->graph = buildMustOrderGraph(boolOrder->order);
@@ -93,20 +96,20 @@ Edge SATEncoder::encodeTotalOrderSATEncoder(BooleanOrder *boolOrder) {
 
 
 void SATEncoder::createAllTotalOrderConstraintsSATEncoder(Order *order) {
-#ifdef TRACE_DEBUG
+#ifdef CONFIG_DEBUG
        model_print("in total order ...\n");
 #endif
-       ASSERT(order->type == TOTAL);
-       Vector<uint64_t> *mems = order->set->members;
-       uint size = mems->getSize();
+       ASSERT(order->type == SATC_TOTAL);
+       Set *set = order->set;
+       uint size = order->set->getSize();
        for (uint i = 0; i < size; i++) {
-               uint64_t valueI = mems->get(i);
+               uint64_t valueI = set->getMemberAt(i);
                for (uint j = i + 1; j < size; j++) {
-                       uint64_t valueJ = mems->get(j);
+                       uint64_t valueJ = set->getMemberAt(j);
                        OrderPair pairIJ(valueI, valueJ, E_NULL);
                        Edge constIJ = getPairConstraint(order, &pairIJ);
                        for (uint k = j + 1; k < size; k++) {
-                               uint64_t valueK = mems->get(k);
+                               uint64_t valueK = set->getMemberAt(k);
                                OrderPair pairJK(valueJ, valueK, E_NULL);
                                OrderPair pairIK(valueI, valueK, E_NULL);
                                Edge constIK = getPairConstraint(order, &pairIK);
@@ -117,7 +120,7 @@ void SATEncoder::createAllTotalOrderConstraintsSATEncoder(Order *order) {
        }
 }
 
-Edge getOrderConstraint(HashTableOrderPair *table, OrderPair *pair) {
+Edge getOrderConstraint(HashtableOrderPair *table, OrderPair *pair) {
        ASSERT(pair->first != pair->second);
        bool negate = false;
        OrderPair flipped;
@@ -144,6 +147,6 @@ Edge SATEncoder::generateTransOrderConstraintSATEncoder(Edge constIJ,Edge constJ
 }
 
 Edge SATEncoder::encodePartialOrderSATEncoder(BooleanOrder *constraint) {
-       ASSERT(constraint->order->type == PARTIAL);
+       ASSERT(constraint->order->type == SATC_PARTIAL);
        return E_BOGUS;
 }