bug fix

[satune.git] / src / csolver.cc

diff --git a/src/csolver.cc b/src/csolver.cc
index 7c13eae9c8bebe007000abf801f735522dd36d67..58177a55647a3fe0f7f344955ccfbacf3efe2757 100644 (file)
--- a/src/csolver.cc
+++ b/src/csolver.cc
@@ -25,6 +25,7 @@
 #include "ordergraph.h"
 #include "orderedge.h"
 #include "orderanalysis.h"
+#include "elementopt.h"
 #include <time.h>
 #include <stdarg.h>
 
@@ -263,14 +264,14 @@ Element *CSolver::applyFunction(Function *function, Element **array, uint numArr
        }
 }
 
-Function *CSolver::createFunctionOperator(ArithOp op, Set **domain, uint numDomain, Set *range,OverFlowBehavior overflowbehavior) {
-       Function *function = new FunctionOperator(op, domain, numDomain, range, overflowbehavior);
+Function *CSolver::createFunctionOperator(ArithOp op, Set *range, OverFlowBehavior overflowbehavior) {
+       Function *function = new FunctionOperator(op, range, overflowbehavior);
        allFunctions.push(function);
        return function;
 }
 
-Predicate *CSolver::createPredicateOperator(CompOp op, Set **domain, uint numDomain) {
-       Predicate *predicate = new PredicateOperator(op, domain,numDomain);
+Predicate *CSolver::createPredicateOperator(CompOp op) {
+       Predicate *predicate = new PredicateOperator(op);
        allPredicates.push(predicate);
        return predicate;
 }
@@ -281,14 +282,14 @@ Predicate *CSolver::createPredicateTable(Table *table, UndefinedBehavior behavio
        return predicate;
 }
 
-Table *CSolver::createTable(Set **domains, uint numDomain, Set *range) {
-       Table *table = new Table(domains,numDomain,range);
+Table *CSolver::createTable(Set *range) {
+       Table *table = new Table(range);
        allTables.push(table);
        return table;
 }
 
-Table *CSolver::createTableForPredicate(Set **domains, uint numDomain) {
-       return createTable(domains, numDomain, NULL);
+Table *CSolver::createTableForPredicate() {
+       return createTable(NULL);
 }
 
 void CSolver::addTableEntry(Table *table, uint64_t *inputs, uint inputSize, uint64_t result) {
@@ -519,8 +520,14 @@ void CSolver::addConstraint(BooleanEdge constraint) {
                        BooleanLogic *b = (BooleanLogic *) constraint.getBoolean();
                        if (!constraint.isNegated()) {
                                if (b->op == SATC_AND) {
-                                       for (uint i = 0; i < b->inputs.getSize(); i++) {
-                                               addConstraint(b->inputs.get(i));
+                                       uint size = b->inputs.getSize();
+                                       //Handle potential concurrent modification
+                                       BooleanEdge array[size];
+                                       for (uint i = 0; i < size; i++) {
+                                               array[i] = b->inputs.get(i);
+                                       }
+                                       for (uint i = 0; i < size; i++) {
+                                               addConstraint(array[i]);
                                        }
                                        return;
                                }
@@ -605,6 +612,9 @@ int CSolver::solve() {
        IntegerEncodingTransform iet(this);
        iet.doTransform();
 
+       ElementOpt eop(this);
+       eop.doTransform();
+       
        EncodingGraph eg(this);
        eg.buildGraph();
        eg.encode();
@@ -704,4 +714,4 @@ void CSolver::autoTune(uint budget) {
 //        }
 //        va_end(args);
 //        return createSet(set->getType(), members, newSize);
-//}
\ No newline at end of file
+//}