bug fix

[satune.git] / src / ASTTransform / integerencoding.cc

diff --git a/src/ASTTransform/integerencoding.cc b/src/ASTTransform/integerencoding.cc
index f4b17b4eae2c1f5e1a08ac1d6a3edc0bbd33025f..621d2a8c927ee9d10d81315c7dab1f25192d1879 100644 (file)
--- a/src/ASTTransform/integerencoding.cc
+++ b/src/ASTTransform/integerencoding.cc
@@ -1,41 +1,61 @@
 #include "integerencoding.h"
-#include "orderelement.h"
+#include "set.h"
 #include "order.h"
 #include "satencoder.h"
 #include "csolver.h"
-#include "predicate.h"
-#include "element.h"
+#include "integerencodingrecord.h"
+#include "integerencorderresolver.h"
+#include "tunable.h"
+#include "polarityassignment.h"
 
-void orderIntegerEncodingSATEncoder(SATEncoder *This, BooleanOrder *boolOrder){
-       Order* order = boolOrder->order;
-       if (order->elementTable == NULL) {
-               order->initializeOrderElementsHashTable();
+IntegerEncodingTransform::IntegerEncodingTransform(CSolver *_solver)
+       : Transform(_solver)
+{
+}
+
+IntegerEncodingTransform::~IntegerEncodingTransform() {
+}
+
+void IntegerEncodingTransform::doTransform() {
+       if (solver->isUnSAT()) {
+               return;
        }
-       //getting two elements and using LT predicate ...
-       Element* elem1 = getOrderIntegerElement(This, order, boolOrder->first);
-       Element* elem2 = getOrderIntegerElement(This, order, boolOrder->second);
-       Set * sarray[]={order->auxSet, order->auxSet};
-       Predicate *predicate =new PredicateOperator(LT, sarray, 2);
-       Element * parray[]={elem1, elem2};
-       BooleanPredicate * boolean=new BooleanPredicate(predicate, parray, 2, NULL);
-       {//Adding new elements and boolean/predicate to solver regarding memory management
-               This->solver->allBooleans.push(boolean);
-               This->solver->allPredicates.push(predicate);
-               This->solver->allElements.push(elem1);
-               This->solver->allElements.push(elem2);
-               This->solver->constraints.add(boolean);
+       HashsetOrder *orders = solver->getActiveOrders()->copy();
+       SetIteratorOrder *orderit = orders->iterator();
+       while (orderit->hasNext()) {
+               Order *order = orderit->next();
+               if (order->type == SATC_PARTIAL)
+                 continue;
+               if (GETVARTUNABLE(solver->getTuner(), order->set->type, ORDERINTEGERENCODING, &offon))
+                       integerEncode(order);
        }
+       delete orders;
+       delete orderit;
 }
 
+void IntegerEncodingTransform::integerEncode(Order *currOrder) {
+       IntegerEncodingRecord *encodingRecord =  new IntegerEncodingRecord(
+               solver->createRangeSet(currOrder->set->getType(), 0, (uint64_t) currOrder->getNumUsed() - 1));
+       currOrder->setOrderEncodingType( INTEGERENCODING );
 
-Element* getOrderIntegerElement(SATEncoder* This,Order *order, uint64_t item) {
-       HashSetOrderElement* eset = order->elementTable;
-       OrderElement oelement ={item, NULL};
-       if( !eset->contains(&oelement)){
-               Element* elem = new ElementSet(order->auxSet);
-               eset->add(allocOrderElement(item, elem));
-               return elem;
-       } else
-               return eset->get(&oelement)->elem;
+       Vector<BooleanOrder *> *constraints = currOrder->getConstraints();
+       uint size = constraints->getSize();
+       for (uint i = 0; i < size; i++) {
+               orderIntegerEncodingSATEncoder(constraints->get(i), encodingRecord);
+       }
+       currOrder->setOrderResolver(new IntegerEncOrderResolver(solver, encodingRecord));
+       solver->getActiveOrders()->remove(currOrder);
+}
+
+
+void IntegerEncodingTransform::orderIntegerEncodingSATEncoder(BooleanOrder *boolOrder, IntegerEncodingRecord *ierec) {
+       //getting two elements and using LT predicate ...
+       Element *elem1 = ierec->getOrderIntegerElement(solver, boolOrder->first);
+       Element *elem2 = ierec->getOrderIntegerElement(solver, boolOrder->second);
+       Predicate *predicate = solver->createPredicateOperator(SATC_LT);
+       Element *parray[] = {elem1, elem2};
+       BooleanEdge boolean = solver->applyPredicate(predicate, parray, 2);
+       updateEdgePolarity(boolean, boolOrder);
+       solver->replaceBooleanWithBoolean(boolOrder, boolean);
 }