fixing alloy performance bugs

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

diff --git a/src/ASTTransform/integerencoding.cc b/src/ASTTransform/integerencoding.cc
index f1b99199c802efca86045282238e3799a41bc9c4..6be73ea9bfbf648d7e2eac98e8610a98c6c8aff6 100644 (file)
--- a/src/ASTTransform/integerencoding.cc
+++ b/src/ASTTransform/integerencoding.cc
@@ -1,4 +1,3 @@
-
 #include "integerencoding.h"
 #include "set.h"
 #include "order.h"
@@ -6,49 +5,50 @@
 #include "csolver.h"
 #include "integerencodingrecord.h"
 #include "integerencorderresolver.h"
+#include "tunable.h"
+#include "polarityassignment.h"
 
-
-IntegerEncodingTransform::IntegerEncodingTransform(CSolver* _solver) 
-       :Transform(_solver)
-{      
-       orderIntEncoding = new HashTableOrderIntEncoding();
+IntegerEncodingTransform::IntegerEncodingTransform(CSolver *_solver)
+       : Transform(_solver)
+{
 }
 
-IntegerEncodingTransform::~IntegerEncodingTransform(){
-       orderIntEncoding->resetanddelete();
+IntegerEncodingTransform::~IntegerEncodingTransform() {
 }
 
-bool IntegerEncodingTransform::canExecuteTransform(){
-       return canExecutePass(solver, currOrder->type, ORDERINTEGERENCODING, &offon);
+void IntegerEncodingTransform::doTransform() {
+       HashsetOrder *orders = solver->getActiveOrders()->copy();
+       SetIteratorOrder *orderit = orders->iterator();
+       while (orderit->hasNext()) {
+               Order *order = orderit->next();
+               if (GETVARTUNABLE(solver->getTuner(), order->type, ORDERINTEGERENCODING, &offon))
+                       integerEncode(order);
+       }
+       delete orders;
+       delete orderit;
 }
 
-void IntegerEncodingTransform::doTransform(){
-       IntegerEncodingRecord* encodingRecord = NULL;
-       if (!orderIntEncoding->contains(currOrder)) {
-               encodingRecord = new IntegerEncodingRecord(
-                       solver->createRangeSet(currOrder->set->getType(), 0, (uint64_t) currOrder->set->getSize()-1));
-               orderIntEncoding->put(currOrder, encodingRecord);
-       } else {
-               encodingRecord = orderIntEncoding->get(currOrder);
-       }
+void IntegerEncodingTransform::integerEncode(Order *currOrder) {
+       IntegerEncodingRecord *encodingRecord =  new IntegerEncodingRecord(
+               solver->createRangeSet(currOrder->set->getType(), 0, (uint64_t) currOrder->set->getSize() - 1));
+       currOrder->setOrderEncodingType( INTEGERENCODING );
        uint size = currOrder->constraints.getSize();
-       for(uint i=0; i<size; i++){
-               orderIntegerEncodingSATEncoder(currOrder->constraints.get(i));
+       for (uint i = 0; i < size; i++) {
+               orderIntegerEncodingSATEncoder(currOrder->constraints.get(i), encodingRecord);
        }
        currOrder->setOrderResolver(new IntegerEncOrderResolver(solver, encodingRecord));
+       solver->getActiveOrders()->remove(currOrder);
 }
 
 
-void IntegerEncodingTransform::orderIntegerEncodingSATEncoder(BooleanOrder *boolOrder) {
-       IntegerEncodingRecord* ierec = orderIntEncoding->get(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);
-       Set *sarray[] = {ierec->getSecondarySet(), ierec->getSecondarySet()};
-       Predicate *predicate = solver->createPredicateOperator(SATC_LT, sarray, 2);
+       Predicate *predicate = solver->createPredicateOperator(SATC_LT);
        Element *parray[] = {elem1, elem2};
-       Boolean *boolean = solver->applyPredicate(predicate, parray, 2);
-       solver->addConstraint(boolean);
+       BooleanEdge boolean = solver->applyPredicate(predicate, parray, 2);
+       updateEdgePolarity(boolean, boolOrder);
        solver->replaceBooleanWithBoolean(boolOrder, boolean);
 }