#include "ordergraph.h"
#include "orderedge.h"
#include "orderanalysis.h"
+#include "elementopt.h"
#include <time.h>
#include <stdarg.h>
}
}
-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;
}
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) {
if (isTrue(constraint))
return;
else if (isFalse(constraint)) {
- int t = 0;
setUnSAT();
}
else {
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;
}
IntegerEncodingTransform iet(this);
iet.doTransform();
+ ElementOpt eop(this);
+ eop.doTransform();
+
EncodingGraph eg(this);
eg.buildGraph();
eg.encode();
SetIteratorBooleanEdge *it = getConstraints();
while (it->hasNext()) {
BooleanEdge b = it->next();
- if (b.isNegated())
- model_print("!");
- b->print();
- model_print("\n");
+ b.print();
}
delete it;
}
delete autotuner;
}
-//Set* CSolver::addItemsToRange(Element* element, uint num, ...){
-// va_list args;
-// va_start(args, num);
-// element->getRange()
-// uint setSize = set->getSize();
-// uint newSize = setSize+ num;
-// uint64_t members[newSize];
-// for(uint i=0; i<setSize; i++){
-// members[i] = set->getElement(i);
-// }
-// for( uint i=0; i< num; i++){
-// uint64_t arg = va_arg(args, uint64_t);
-// members[setSize+i] = arg;
-// }
-// va_end(args);
-// return createSet(set->getType(), members, newSize);
-//}
\ No newline at end of file
+